From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 14 Jan 2017 21:30:51 +0000 (+0100)
Subject: selinux: Return directly after a failed kzalloc() in class_read()
X-Git-Tag: v4.12-rc1~123^2~6^2~9
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=df4a14dfb484f95d81126e481e66b6e22eec49e8;p=linux.git

selinux: Return directly after a failed kzalloc() in class_read()

Return directly after a call of the function "kzalloc" failed
at the beginning.

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 30f29c669e32..edf173ed05f8 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -1318,10 +1318,9 @@ static int class_read(struct policydb *p, struct hashtab *h, void *fp)
 	u32 len, len2, ncons, nel;
 	int i, rc;
 
-	rc = -ENOMEM;
 	cladatum = kzalloc(sizeof(*cladatum), GFP_KERNEL);
 	if (!cladatum)
-		goto bad;
+		return -ENOMEM;
 
 	rc = next_entry(buf, fp, sizeof(u32)*6);
 	if (rc)