Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Cluster Development (http://www.linux-archive.org/cluster-development/)
-   -   libgfscontrol: Fix resource leaks (http://www.linux-archive.org/cluster-development/623141-libgfscontrol-fix-resource-leaks.html)

Andrew Price 01-20-2012 11:39 AM

libgfscontrol: Fix resource leaks
 
Spotted by coverity:
- Variable "reply" going out of scope leaks the storage it points to (3
occurrences) and
- Handle variable "fd" going out of scope leaks the handle.

Signed-off-by: Andrew Price <anprice@redhat.com>
---
group/libgfscontrol/main.c | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/group/libgfscontrol/main.c b/group/libgfscontrol/main.c
index c6eaf97..96a8e03 100644
--- a/group/libgfscontrol/main.c
+++ b/group/libgfscontrol/main.c
@@ -108,7 +108,7 @@ static int do_dump(int cmd, char *name, char *buf)
fd = do_connect(GFSC_QUERY_SOCK_PATH);
if (fd < 0) {
rv = fd;
- goto out;
+ goto out_free;
}

rv = do_write(fd, &h, sizeof(h));
@@ -127,6 +127,8 @@ static int do_dump(int cmd, char *name, char *buf)
GFSC_DUMP_SIZE);
out_close:
close(fd);
+ out_free:
+ free(reply);
out:
return rv;
}
@@ -238,7 +240,7 @@ int gfsc_mountgroups(int max, int *count, struct gfsc_mountgroup *mgs)
fd = do_connect(GFSC_QUERY_SOCK_PATH);
if (fd < 0) {
rv = fd;
- goto out;
+ goto out_free;
}

rv = do_write(fd, &h, sizeof(h));
@@ -268,6 +270,8 @@ int gfsc_mountgroups(int max, int *count, struct gfsc_mountgroup *mgs)
mg_count * sizeof(struct gfsc_mountgroup));
out_close:
close(fd);
+ out_free:
+ free(reply);
out:
return rv;
}
@@ -296,7 +300,7 @@ int gfsc_mountgroup_nodes(char *name, int type, int max, int *count,
fd = do_connect(GFSC_QUERY_SOCK_PATH);
if (fd < 0) {
rv = fd;
- goto out;
+ goto out_free;
}

rv = do_write(fd, &h, sizeof(h));
@@ -326,6 +330,8 @@ int gfsc_mountgroup_nodes(char *name, int type, int max, int *count,
node_count * sizeof(struct gfsc_node));
out_close:
close(fd);
+ out_free:
+ free(reply);
out:
return rv;
}
@@ -409,7 +415,7 @@ int gfsc_fs_leave(struct gfsc_mount_args *ma, int reason)
char msg[sizeof(struct gfsc_header) + sizeof(struct gfsc_mount_args)];
struct gfsc_header *h = (struct gfsc_header *)msg;
char *name = strstr(ma->table, ":") + 1;
- int fd;
+ int fd, err;

init_header(h, GFSC_CMD_FS_LEAVE, name,
sizeof(struct gfsc_mount_args));
@@ -423,6 +429,8 @@ int gfsc_fs_leave(struct gfsc_mount_args *ma, int reason)
if (fd < 0)
return fd;

- return do_write(fd, msg, sizeof(msg));
+ err = do_write(fd, msg, sizeof(msg));
+ close(fd);
+ return err;
}

--
1.7.7.5


All times are GMT. The time now is 01:40 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.