Commit 28f259b7 authored by Vasiliy Kulikov's avatar Vasiliy Kulikov Committed by Sage Weil

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.
Signed-off-by: default avatarVasiliy Kulikov <segooon@gmail.com>
Signed-off-by: default avatarYehuda Sadeh <yehuda@hq.newdream.net>
parent 496e5955
......@@ -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:
if (opt)
ceph_destroy_options(opt);
return ERR_PTR(-ENOMEM);
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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment