apparmor: fix memory leak on buffer on error exit path

Colin Ian King · jrjohansen · commit 588558eb6d0e · 2018-03-30T21:14:04.000-07:00
Currently on the error exit path the allocated buffer is not free'd causing a memory leak. Fix this by kfree'ing it. Detected by CoverityScan, CID#1466876 ("Resource leaks") Fixes: 1180b4c ("apparmor: fix dangling symlinks to policy rawdata after replacement") Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: John Johansen <john.johansen@canonical.com>
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
@@ -1497,8 +1497,10 @@ static char *gen_symlink_name(int depth, const char *dirname, const char *fname)
 	}
 
 	error = snprintf(s, size, "raw_data/%s/%s", dirname, fname);
-	if (error >= size || error < 0)
+	if (error >= size || error < 0) {
+		kfree(buffer);
 		return ERR_PTR(-ENAMETOOLONG);
+	}
 
 	return buffer;
 }

Original file line number	Diff line number	Diff line change
`@@ -1497,8 +1497,10 @@ static char gen_symlink_name(int depth, const char dirname, const char *fname)`
`1497`	`1497`	`}`
`1498`	`1498`
`1499`	`1499`	`error = snprintf(s, size, "raw_data/%s/%s", dirname, fname);`
`1500`		`- if (error >= size \|\| error < 0)`
	`1500`	`+ if (error >= size \|\| error < 0) {`
	`1501`	`+ kfree(buffer);`
`1501`	`1502`	`return ERR_PTR(-ENAMETOOLONG);`
	`1503`	`+ }`
`1502`	`1504`
`1503`	`1505`	`return buffer;`
`1504`	`1506`	`}`