lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rbd: fix image id leak in initial probe

Browse Source 
If a format 2 image id is found for an image being mapped, but the
subsequent probe of the image fails, rbd_dev_probe() quits without
freeing the image id.  Fix that.

Also drop a redundant hunk of code in rbd_dev_image_id().

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder
2013-04-25 23:15:08 -05:00
committed by Sage Weil
parent c0fba36880
commit 5655c4d940
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/block/rbd.c
View File

@@ -4800,16 +4800,20 @@ static int rbd_dev_probe(struct rbd_device *rbd_dev)
ret = rbd_dev_v1_probe(rbd_dev); ret = rbd_dev_v1_probe(rbd_dev);
else else
ret = rbd_dev_v2_probe(rbd_dev); ret = rbd_dev_v2_probe(rbd_dev);
if (ret) { if (ret)
dout("probe failed, returning %d\n", ret); goto out_err;
return ret;
}
ret = rbd_dev_probe_finish(rbd_dev); ret = rbd_dev_probe_finish(rbd_dev);
if (ret) if (ret)
rbd_header_free(&rbd_dev->header); rbd_header_free(&rbd_dev->header);
return ret;
out_err:
kfree(rbd_dev->spec->image_id);
rbd_dev->spec->image_id = NULL;
dout("probe failed, returning %d\n", ret);
return ret; return ret;
} }