From: Namhyung Kim <namhyung@kernel.org>
Date: Sat, 14 Jun 2014 16:19:02 +0000 (+0900)
Subject: selinux: fix a possible memory leak in cond_read_node()
X-Git-Tag: v3.17-rc1~57^2~8
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6e51f9cbfa04a92b40e7f9c1e76c8ecbff534a22;p=karo-tx-linux.git

selinux: fix a possible memory leak in cond_read_node()

The cond_read_node() should free the given node on error path as it's
not linked to p->cond_list yet.  This is done via cond_node_destroy()
but it's not called when next_entry() fails before the expr loop.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Paul Moore <pmoore@redhat.com>
---

diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c
index f09cc7268b65..62c6773be0b7 100644
--- a/security/selinux/ss/conditional.c
+++ b/security/selinux/ss/conditional.c
@@ -404,7 +404,7 @@ static int cond_read_node(struct policydb *p, struct cond_node *node, void *fp)
 
 	rc = next_entry(buf, fp, sizeof(u32) * 2);
 	if (rc)
-		return rc;
+		goto err;
 
 	node->cur_state = le32_to_cpu(buf[0]);