iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: rbd: fixed may leaks

Browse Source 
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>
This commit is contained in:
Vasiliy Kulikov 2010-09-26 12:59:37 +04:00 committed by Sage Weil
parent 496e59553c
commit 28f259b7cd
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/block/rbd.c
View File

@ -241,6 +241,7 @@ static struct rbd_client *rbd_client_create(struct ceph_options *opt)
rbdc->client = ceph_create_client(opt, rbdc); rbdc->client = ceph_create_client(opt, rbdc);
if (IS_ERR(rbdc->client)) if (IS_ERR(rbdc->client))
goto out_rbdc; goto out_rbdc;
opt = NULL; /* Now rbdc->client is responsible for opt */
ret = ceph_open_session(rbdc->client); ret = ceph_open_session(rbdc->client);
if (ret < 0) if (ret < 0)
@ -255,13 +256,12 @@ static struct rbd_client *rbd_client_create(struct ceph_options *opt)
out_err: out_err:
ceph_destroy_client(rbdc->client); ceph_destroy_client(rbdc->client);
return ERR_PTR(ret);
out_rbdc: out_rbdc:
kfree(rbdc); kfree(rbdc);
out_opt: out_opt:
ceph_destroy_options(opt); if (opt)
return ERR_PTR(-ENOMEM); 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, rbd_dev->header.block_name,
ofs, len, ofs, len,
seg_name, &seg_ofs); seg_name, &seg_ofs);
if (seg_len < 0) if ((s64)seg_len < 0) {
return seg_len; ret = seg_len;
goto done;
}
payload_len = (flags & CEPH_OSD_FLAG_WRITE ? seg_len : 0); payload_len = (flags & CEPH_OSD_FLAG_WRITE ? seg_len : 0);