RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 09:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: fix leak of fd when importing an image from a file

Browse Source 
CID 719579: Resource leak (RESOURCE_LEAK)
At (7): Handle variable "fd" going out of scope leaks the handle.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Josh Durgin 2012-09-24 15:27:55 -07:00 committed by Samuel Just
parent dd10b1e834
commit 2d44a1a3e1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rbd.cc
View File

@ -589,6 +589,7 @@ static int do_import(librbd::RBD &rbd, librados::IoCtx& io_ctx,
if (r < 0) {
r = -errno;
cerr << "stat error " << path << std::endl;
close(fd);
return r;
}
if (stat_buf.st_size)
@ -598,6 +599,7 @@ static int do_import(librbd::RBD &rbd, librados::IoCtx& io_ctx,
r = get_block_device_size(fd, &size);
if (r < 0) {
cerr << "unable to get size of file/block device: " << cpp_strerror(r) << std::endl;
close(fd);
return r;
}
}
@ -607,12 +609,14 @@ static int do_import(librbd::RBD &rbd, librados::IoCtx& io_ctx,
r = do_create(rbd, io_ctx, imgname, size, order, format, features);
if (r < 0) {
cerr << "image creation failed" << std::endl;
close(fd);
return r;
}
librbd::Image image;
r = rbd.open(io_ctx, image, imgname);
if (r < 0) {
cerr << "failed to open image" << std::endl;
close(fd);
return r;
}
fsync(fd); /* flush it first, otherwise extents information might not have been flushed yet */
@ -626,6 +630,7 @@ static int do_import(librbd::RBD &rbd, librados::IoCtx& io_ctx,
fiemap = (struct fiemap *)malloc(sizeof(struct fiemap) + sizeof(struct fiemap_extent));
if (!fiemap) {
cerr << "Failed to allocate fiemap, not enough memory." << std::endl;
close(fd);
return -ENOMEM;
}
fiemap->fm_start = 0;
@ -720,6 +725,7 @@ static int do_import(librbd::RBD &rbd, librados::IoCtx& io_ctx,
else
pc.finish();
free(fiemap);
close(fd);
return r;
}