[PATCH 12/46] selinux: Move assignments for two pointers in genfs_read()

SF Markus Elfring
2017-01-15T15:12:20Z

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 14 Jan 2017 16:56:51 +0100

Move the assignment for the local variables "newc" and "newgenfs" behind
a call of the function "next_entry" at the beginning so that they will
only be set after a successful call.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
security/selinux/ss/policydb.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index 754f829d2027..7544e374dec9 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -1997,14 +1997,14 @@ static int genfs_read(struct policydb *p, void *fp)
int i, j, rc;
u32 nel, nel2, len, len2;
__le32 buf[1];
- struct ocontext *l, *c;
- struct ocontext *newc = NULL;
- struct genfs *genfs_p, *genfs;
- struct genfs *newgenfs = NULL;
+ struct ocontext *l, *c, *newc;
+ struct genfs *genfs_p, *genfs, *newgenfs;

rc = next_entry(buf, fp, sizeof(u32));
if (rc)
return rc;
+ newc = NULL;
+ newgenfs = NULL;
nel = le32_to_cpu(buf[0]);

for (i = 0; i < nel; i++) {
--
2.11.0