[PATCH 23/46] selinux: Move an assignment for a pointer in range_read()
From: paul@paul-moore.com (Paul Moore)
Date: 2017-03-23 22:18:53
Also in:
kernel-janitors, lkml, selinux
On Sun, Jan 15, 2017 at 10:23 AM, SF Markus Elfring [off-list ref] wrote:
From: Markus Elfring <redacted> Date: Sat, 14 Jan 2017 21:00:45 +0100 Move the assignment for the local variable "r" behind a call of the function "next_entry" at the beginning so that it will only be set after a successful call. Signed-off-by: Markus Elfring <redacted> --- security/selinux/ss/policydb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
See previous comments.
quoted hunk
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index 6121a26ada64..5101592ae172 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c@@ -1840,7 +1840,7 @@ u32 string_to_av_perm(struct policydb *p, u16 tclass, const char *name) static int range_read(struct policydb *p, void *fp) { struct range_trans *rt; - struct mls_range *r = NULL; + struct mls_range *r; int i, rc; __le32 buf[2]; u32 nel;@@ -1852,6 +1852,7 @@ static int range_read(struct policydb *p, void *fp) if (rc) return rc; + r = NULL; nel = le32_to_cpu(buf[0]); for (i = 0; i < nel; i++) { rt = kzalloc(sizeof(*rt), GFP_KERNEL); --2.11.0
-- paul moore www.paul-moore.com -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html