block: rbd: fixed may leaks
Subsystems (3)
PATCH 1/1 block: rbd: fixed may leaks
rbd_client_create() doesn't free rbdc, this leads to many leaks.
seg_len in rbd_do_op() is unsigned, so (seg_len < 0) makes no sense. Also if fixed check fails then seg_name is leaked.
---
Compile tested.
drivers/block/rbd.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-)
drivers/block/rbd.c +8 -6
@@ -241,6 +241,7 @@ static struct rbd_client *rbd_client_create(struct ceph_options *opt) rbdc->client =ceph_create_client (opt, rbdc);if (IS_ERR (rbdc->client)) goto out_rbdc; + opt =NULL ;/* Now rbdc->client is responsible for opt */ ret =ceph_open_session (rbdc->client);if (ret <0 )
@@ -255,13 +256,12 @@ static struct rbd_client *rbd_client_create(struct ceph_options *opt) out_err:ceph_destroy_client (rbdc->client); -return ERR_PTR (ret); - out_rbdc:kfree (rbdc); out_opt: -ceph_destroy_options (opt); -return ERR_PTR (-ENOMEM ); +if (opt) +ceph_destroy_options (opt); +return ERR_PTR (ret); }/*
@@ -889,8 +889,10 @@ static int rbd_do_op(struct request *rq, rbd_dev->header.block_name, ofs, len, seg_name, &seg_ofs); -if (seg_len <0 ) -return seg_len; +if ((s64 )seg_len <0 ) { + ret = seg_len; + goto done; + } payload_len = (flags &CEPH_OSD_FLAG_WRITE ? seg_len :0 );
Signature · 1 line
1.7.0.4
Yehuda Sadeh Weinraub
AppliedQuoted 5 lines · Vasiliy Kulikov
rbd_client_create()doesn't free rbdc, this leads to many leaks.
seg_leninrbd_do_op()is unsigned, so (seg_len< 0) makes no sense. Also if fixed check fails thenseg_nameis leaked.
---
Pushed to our unstable tree. Added missing signed-off by.
Thanks,
Yehuda