From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 15 Jan 2017 10:15:19 +0000 (+0100)
Subject: selinux: Return directly after a failed kzalloc() in common_read()
X-Git-Tag: v4.12-rc1~123^2~6^2~8
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=442ca4d656645505346017c37ac137cde680bf38;p=linux.git

selinux: Return directly after a failed kzalloc() in common_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 edf173ed05f8..99ee0ee2d92a 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -1152,10 +1152,9 @@ static int common_read(struct policydb *p, struct hashtab *h, void *fp)
 	u32 len, nel;
 	int i, rc;
 
-	rc = -ENOMEM;
 	comdatum = kzalloc(sizeof(*comdatum), GFP_KERNEL);
 	if (!comdatum)
-		goto bad;
+		return -ENOMEM;
 
 	rc = next_entry(buf, fp, sizeof buf);
 	if (rc)