rbd: plug rbd_dev->header.object_prefix memory leak

idryomov · idryomov · commit d194cd1dd1be · 2015-09-08T23:14:30.000+03:00
Need to free object_prefix when rbd_dev_v2_snap_context() fails, but
only if this is the first time we are reading in the header.

Signed-off-by: Ilya Dryomov &lt;idryomov@gmail.com&gt;
Reviewed-by: Alex Elder &lt;elder@linaro.org&gt;
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
@@ -4720,7 +4720,10 @@ static int rbd_dev_v2_header_info(struct rbd_device *rbd_dev)
 	}
 
 	ret = rbd_dev_v2_snap_context(rbd_dev);
-	dout("rbd_dev_v2_snap_context returned %d\n", ret);
+	if (ret && first_time) {
+		kfree(rbd_dev->header.object_prefix);
+		rbd_dev->header.object_prefix = NULL;
+	}
 
 	return ret;
 }

Original file line number	Diff line number	Diff line change
`@@ -4720,7 +4720,10 @@ static int rbd_dev_v2_header_info(struct rbd_device *rbd_dev)`
`4720`	`4720`	`}`
`4721`	`4721`
`4722`	`4722`	`ret = rbd_dev_v2_snap_context(rbd_dev);`
`4723`		`- dout("rbd_dev_v2_snap_context returned %d\n", ret);`
	`4723`	`+ if (ret && first_time) {`
	`4724`	`+ kfree(rbd_dev->header.object_prefix);`
	`4725`	`+ rbd_dev->header.object_prefix = NULL;`
	`4726`	`+ }`
`4724`	`4727`
`4725`	`4728`	`return ret;`
`4726`	`4729`	`}`