[Xen-changelog] [xen stable-4.5] xen/xsm: Make p->policyvers be a local variable (ver) to shut up GCC 5.1.1 warnings.

[patchbot@xxxxxxx]

commit d3d476f505a124cd3d6ac7f5b2aedfe6c21fea86
Author:     Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
AuthorDate: Thu Oct 8 11:33:28 2015 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Oct 8 11:33:28 2015 +0200

    xen/xsm: Make p->policyvers be a local variable (ver) to shut up GCC 5.1.1 
warnings.

    policydb.c: In function â??user_readâ??:
    policydb.c:1443:26: error: â??buf[2]â?? may be used uninitialized in this 
function [-Werror=maybe-uninitialized]
             usrdatum->bounds = le32_to_cpu(buf[2]);
                              ^
    cc1: all warnings being treated as errors

    Which (as Andrew mentioned) is because GCC cannot assume
    that 'p->policyvers' has the same value between checks.

    We make it local, optimize the name to 'ver' and the warnings go away.
    We also update another call site with this modification to
    make it more inline with the rest of the functions.

    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
    Acked-by: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
    master commit: 6a2f81459e1455d65a9a6f78dd2a0d0278619680
    master date: 2015-09-22 12:09:03 -0400
---
 xen/xsm/flask/ss/policydb.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/xen/xsm/flask/ss/policydb.c b/xen/xsm/flask/ss/policydb.c
index 50b2c78..f4384eb 100644
--- a/xen/xsm/flask/ss/policydb.c
+++ b/xen/xsm/flask/ss/policydb.c
@@ -1219,6 +1219,7 @@ static int role_read(struct policydb *p, struct hashtab 
*h, void *fp)
     int rc;
     __le32 buf[3];
     u32 len;
+    u32 ver = p->policyvers;

     role = xzalloc(struct role_datum);
     if ( !role )
@@ -1227,7 +1228,7 @@ static int role_read(struct policydb *p, struct hashtab 
*h, void *fp)
         goto out;
     }

-    if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY )
+    if ( ver >= POLICYDB_VERSION_BOUNDARY )
         rc = next_entry(buf, fp, sizeof(buf[0]) * 3);
     else
         rc = next_entry(buf, fp, sizeof(buf[0]) * 2);
@@ -1237,7 +1238,7 @@ static int role_read(struct policydb *p, struct hashtab 
*h, void *fp)

     len = le32_to_cpu(buf[0]);
     role->value = le32_to_cpu(buf[1]);
-    if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY )
+    if ( ver >= POLICYDB_VERSION_BOUNDARY )
         role->bounds = le32_to_cpu(buf[2]);

     key = xmalloc_array(char, len + 1);
@@ -1289,6 +1290,7 @@ static int type_read(struct policydb *p, struct hashtab 
*h, void *fp)
     int rc;
     __le32 buf[4];
     u32 len;
+    u32 ver = p->policyvers;

     typdatum = xzalloc(struct type_datum);
     if ( !typdatum )
@@ -1297,7 +1299,7 @@ static int type_read(struct policydb *p, struct hashtab 
*h, void *fp)
         return rc;
     }

-    if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY )
+    if ( ver >= POLICYDB_VERSION_BOUNDARY )
         rc = next_entry(buf, fp, sizeof(buf[0]) * 4);
     else
         rc = next_entry(buf, fp, sizeof(buf[0]) * 3);
@@ -1307,7 +1309,7 @@ static int type_read(struct policydb *p, struct hashtab 
*h, void *fp)

     len = le32_to_cpu(buf[0]);
     typdatum->value = le32_to_cpu(buf[1]);
-    if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY )
+    if ( ver >= POLICYDB_VERSION_BOUNDARY )
     {
         u32 prop = le32_to_cpu(buf[2]);

@@ -1382,6 +1384,7 @@ static int user_read(struct policydb *p, struct hashtab 
*h, void *fp)
     int rc;
     __le32 buf[3];
     u32 len;
+    u32 ver = p->policyvers;

     usrdatum = xzalloc(struct user_datum);
     if ( !usrdatum )
@@ -1390,7 +1393,7 @@ static int user_read(struct policydb *p, struct hashtab 
*h, void *fp)
         goto out;
     }

-    if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY )
+    if ( ver >= POLICYDB_VERSION_BOUNDARY )
         rc = next_entry(buf, fp, sizeof(buf[0]) * 3);
     else
         rc = next_entry(buf, fp, sizeof(buf[0]) * 2);
@@ -1400,7 +1403,7 @@ static int user_read(struct policydb *p, struct hashtab 
*h, void *fp)

     len = le32_to_cpu(buf[0]);
     usrdatum->value = le32_to_cpu(buf[1]);
-    if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY )
+    if ( ver >= POLICYDB_VERSION_BOUNDARY )
         usrdatum->bounds = le32_to_cpu(buf[2]);

     key = xmalloc_array(char, len + 1);
@@ -1418,7 +1421,7 @@ static int user_read(struct policydb *p, struct hashtab 
*h, void *fp)
     if ( rc )
         goto bad;

-    if ( p->policyvers >= POLICYDB_VERSION_MLS )
+    if ( ver >= POLICYDB_VERSION_MLS )
     {
         rc = mls_read_range_helper(&usrdatum->range, fp);
         if ( rc )
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.5

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog