Skip to content

Commit

Permalink
block: rbd: fixed may leaks
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
  • Loading branch information
Vasiliy Kulikov authored and Sage Weil committed Oct 20, 2010
1 parent 496e595 commit 28f259b
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions drivers/block/rbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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);
}

/*
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 28f259b

Please sign in to comment.