From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Mon, 4 Jan 2016 22:37:17 +0000 (-0800)
Subject: coverity: ovl_clonepaths: free osrc and ndelta on error paths
X-Git-Tag: lxc-2.0.0.beta2~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=278d97f74a7d4a46768bad91601c94ed7b1fc158;p=thirdparty%2Flxc.git

coverity: ovl_clonepaths: free osrc and ndelta on error paths

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/bdev/lxcoverlay.c b/src/lxc/bdev/lxcoverlay.c
index fa4ea5c0f..d06d24f51 100644
--- a/src/lxc/bdev/lxcoverlay.c
+++ b/src/lxc/bdev/lxcoverlay.c
@@ -177,18 +177,26 @@ int ovl_clonepaths(struct bdev *orig, struct bdev *new, const char *oldname,
 		 * up)
 		 */
 		lastslash = strrchr(ndelta, '/');
-		if (!lastslash)
+		if (!lastslash) {
+			free(osrc);
+			free(ndelta);
 			return -1;
+		}
 		lastslash++;
 		lastslashidx = lastslash - ndelta;
 
 		work = malloc(lastslashidx + 7);
-		if (!work)
+		if (!work) {
+			free(osrc);
+			free(ndelta);
 			return -1;
+		}
 		strncpy(work, ndelta, lastslashidx + 1);
 		strcpy(work + lastslashidx, "olwork");
 		if ((mkdir(work, 0755) < 0) && errno != EEXIST) {
 			SYSERROR("error: mkdir %s", work);
+			free(osrc);
+			free(ndelta);
 			free(work);
 			return -1;
 		}