From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 14 Jan 2017 16:43:47 +0000 (+0100)
Subject: selinux: One function call less in genfs_read() after null pointer detection
X-Git-Tag: v4.12-rc1~123^2~6^2~19
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=315e01ada8047cba0520ecca050ad8f5237abb41;p=linux.git

selinux: One function call less in genfs_read() after null pointer detection

Call the function "kfree" at the end only after it was determined
that the local variable "newgenfs" contained a non-null pointer.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Paul Moore <paul@paul-moore.com>
---

diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index 375e304070e1..4390558464c5 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -2098,9 +2098,10 @@ static int genfs_read(struct policydb *p, void *fp)
 	}
 	rc = 0;
 out:
-	if (newgenfs)
+	if (newgenfs) {
 		kfree(newgenfs->fstype);
-	kfree(newgenfs);
+		kfree(newgenfs);
+	}
 	ocontext_destroy(newc, OCON_FSUSE);
 
 	return rc;