From: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Fri, 27 Apr 2007 14:01:38 +0000 (+0200)
Subject: [S390] cio: cm_enable memory leak.
X-Git-Tag: v2.6.22-rc1~1130^2~23
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c4941c53b14e5a08ed2f270e9f087b410a9abcc;p=linux-2.6

[S390] cio: cm_enable memory leak.

We allocage two pages when channel path measurements are enabled
via cm_enable. We must not forget to free them again when
channel path measurements are disabled again.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 0841e16b6a..ea92ac4d65 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -818,7 +818,7 @@ chsc_secm(struct channel_subsystem *css, int enable)
 		} else
 			chsc_remove_cmg_attr(css);
 	}
-	if (enable && !css->cm_enabled) {
+	if (!css->cm_enabled) {
 		free_page((unsigned long)css->cub_addr1);
 		free_page((unsigned long)css->cub_addr2);
 	}