From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Mon, 7 Sep 2015 17:52:31 +0000 (+0200)
Subject: s390/cio: fix memleak in channel measurement
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a5e9ca573b5fe47aef30e9c33c31b5fe7b0dfb88;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

s390/cio: fix memleak in channel measurement

The measurement block for the extended measurement data is not freed when
switching off per device measurement. Free the measurement block after HW
stopped accessing it.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Reviewed-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index 59b1ac24f992..0d1898e51171 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -876,8 +876,10 @@ static void free_cmbe(struct ccw_device *cdev)
 	spin_lock_irq(cdev->ccwlock);
 	cmb_data = cdev->private->cmb;
 	cdev->private->cmb = NULL;
-	if (cmb_data)
+	if (cmb_data) {
 		kfree(cmb_data->last_block);
+		kfree(cmb_data->hw_block);
+	}
 	kfree(cmb_data);
 
 	/* deactivate global measurement if this is the last channel */