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

selinux: Return directly after a failed kzalloc() in user_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 4759c22d1ae6..9a90953974b8 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -1544,10 +1544,9 @@ static int user_read(struct policydb *p, struct hashtab *h, void *fp)
 	__le32 buf[3];
 	u32 len;
 
-	rc = -ENOMEM;
 	usrdatum = kzalloc(sizeof(*usrdatum), GFP_KERNEL);
 	if (!usrdatum)
-		goto bad;
+		return -ENOMEM;
 
 	if (p->policyvers >= POLICYDB_VERSION_BOUNDARY)
 		to_read = 3;