浏览代码

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>
Sebastian Ott 10 年之前
父节点
当前提交
a5e9ca573b
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      drivers/s390/cio/cmf.c

+ 3 - 1
drivers/s390/cio/cmf.c

@@ -876,8 +876,10 @@ static void free_cmbe(struct ccw_device *cdev)
 	spin_lock_irq(cdev->ccwlock);
 	spin_lock_irq(cdev->ccwlock);
 	cmb_data = cdev->private->cmb;
 	cmb_data = cdev->private->cmb;
 	cdev->private->cmb = NULL;
 	cdev->private->cmb = NULL;
-	if (cmb_data)
+	if (cmb_data) {
 		kfree(cmb_data->last_block);
 		kfree(cmb_data->last_block);
+		kfree(cmb_data->hw_block);
+	}
 	kfree(cmb_data);
 	kfree(cmb_data);
 
 
 	/* deactivate global measurement if this is the last channel */
 	/* deactivate global measurement if this is the last channel */