[lxc-devel] [lxc/master] fix memory and resource leak

[0x0916 on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 340 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20170623/daf5277b/attachment.bin>
-------------- next part --------------
From 17ac53014ba7bfa26e84096abd3b179d1752b18b Mon Sep 17 00:00:00 2001
From: 0x0916 <w at laoqinren.net>
Date: Fri, 23 Jun 2017 20:36:56 +0800
Subject: [PATCH] fix memory and resource leak

Signed-off-by: 0x0916 <w at laoqinren.net>
---
 src/lxc/attach.c    | 1 +
 src/lxc/bdev/bdev.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index eae494067..7cfca4342 100644
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -207,6 +207,7 @@ static struct lxc_proc_context_info *lxc_proc_get_context_info(pid_t pid)
 	info = calloc(1, sizeof(*info));
 	if (!info) {
 		SYSERROR("Could not allocate memory.");
+		fclose(proc_file);
 		return NULL;
 	}
 
diff --git a/src/lxc/bdev/bdev.c b/src/lxc/bdev/bdev.c
index 91eb42a0a..44c4e0423 100644
--- a/src/lxc/bdev/bdev.c
+++ b/src/lxc/bdev/bdev.c
@@ -754,8 +754,10 @@ int do_mkfs_exec_wrapper(void *args)
 		return -1;
 
 	ret = snprintf(mkfs, len, "mkfs.%s", data[0]);
-	if (ret < 0 || (size_t)ret >= len)
+	if (ret < 0 || (size_t)ret >= len) {
+		free(mkfs);
 		return -1;
+	}
 
 	TRACE("executing \"%s %s\"", mkfs, data[1]);
 	execlp(mkfs, mkfs, data[1], (char *)NULL);