From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 14 Jan 2017 18:35:59 +0000 (+0100)
Subject: selinux: Return directly after a failed next_entry() in range_read()
X-Git-Tag: v4.12-rc1~123^2~6^2~17
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=57152a5be08e240654993984a0f6e54254882626;p=linux.git

selinux: Return directly after a failed next_entry() in range_read()

Return directly after a call of the function "next_entry" 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 7131251be628..6c093018ae8d 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -1852,7 +1852,7 @@ static int range_read(struct policydb *p, void *fp)
 
 	rc = next_entry(buf, fp, sizeof(u32));
 	if (rc)
-		goto out;
+		return rc;
 
 	nel = le32_to_cpu(buf[0]);
 	for (i = 0; i < nel; i++) {