diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2015-08-31 14:21:39 +0200 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2015-09-08 22:14:29 +0200 |
| commit | 3ebe138ac642a195c7f2efdb918f464734421fd6 (patch) | |
| tree | 46a1a5e7244247574e78f39ea7053f9b08bb97ea /drivers | |
| parent | libceph: set 'exists' flag for newly up osd (diff) | |
| download | linux-3ebe138ac642a195c7f2efdb918f464734421fd6.tar.xz linux-3ebe138ac642a195c7f2efdb918f464734421fd6.zip | |
rbd: fix double free on rbd_dev->header_name
If rbd_dev_image_probe() in rbd_dev_probe_parent() fails, header_name
is freed twice: once in rbd_dev_probe_parent() and then in its caller
rbd_dev_image_probe() (rbd_dev_image_probe() is called recursively to
handle parent images).
rbd_dev_probe_parent() is responsible for probing the parent, so it
shouldn't muck with clone's fields.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/rbd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index bc67a93aa4f4..324bf35ec4dd 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -5201,7 +5201,6 @@ static int rbd_dev_probe_parent(struct rbd_device *rbd_dev) out_err: if (parent) { rbd_dev_unparent(rbd_dev); - kfree(rbd_dev->header_name); rbd_dev_destroy(parent); } else { rbd_put_client(rbdc); |