[PATCH] xen/xsm: Shut up GCC 5.1.1 warnings.

[PATCH] xen/xsm: Shut up GCC 5.1.1 warnings.

[Konrad Rzeszutek Wilk]

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 makes no sense, as :
 1). A couple of lines above it is being filled (buf[2]).
 2). There are other instances of this which are not triggering this
     failure.

But GCC insists, and this patch stops the failures.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
v2: Wrong placement of the buf[2]=0;
---
 xen/xsm/flask/ss/policydb.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xen/xsm/flask/ss/policydb.c b/xen/xsm/flask/ss/policydb.c
index a1060b1..30ef9c5 100644
--- a/xen/xsm/flask/ss/policydb.c
+++ b/xen/xsm/flask/ss/policydb.c
@@ -1266,6 +1266,7 @@ static int role_read(struct policydb *p, struct hashtab *h, void *fp)
         goto out;
     }
 
+    buf[2] = 0; /* To shut up compiler warnings. */
     if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY )
         rc = next_entry(buf, fp, sizeof(buf[0]) * 3);
     else
@@ -1429,6 +1430,7 @@ static int user_read(struct policydb *p, struct hashtab *h, void *fp)
         goto out;
     }
 
+    buf[2] = 0; /* To shut up compiler warnings. */
     if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY )
         rc = next_entry(buf, fp, sizeof(buf[0]) * 3);
     else
-- 
2.4.3


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] xen/xsm: Shut up GCC 5.1.1 warnings.

[Andrew Cooper]

On 16/09/2015 18:12, Konrad Rzeszutek Wilk wrote:
> 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 makes no sense, as :
>  1). A couple of lines above it is being filled (buf[2]).
>  2). There are other instances of this which are not triggering this
>      failure.
>
> But GCC insists, and this patch stops the failures.
>
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

A better bet would just be to initialise buf at declaration time, so
"__le32 buf[3] = { 0 };"

The reason this warning is firing is that C may not assume that
p->policyvers doesn't change between the next_entry() call and the
role->bounds assignment.  Pulling p->policyvers into a local variable
might also be sufficient.

~Andrew

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

[PATCH] xen/xsm: Shut up GCC 5.1.1 warnings.

[Konrad Rzeszutek Wilk]

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 makes no sense, as :
 1). A couple of lines above it is being filled (buf[2]).
 2). There are other instances of this which are not triggering this
     failure.

But GCC insists, and this patch stops the failures.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
 xen/xsm/flask/ss/policydb.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xen/xsm/flask/ss/policydb.c b/xen/xsm/flask/ss/policydb.c
index a1060b1..cee259c 100644
--- a/xen/xsm/flask/ss/policydb.c
+++ b/xen/xsm/flask/ss/policydb.c
@@ -1274,6 +1274,7 @@ static int role_read(struct policydb *p, struct hashtab *h, void *fp)
     if ( rc < 0 )
         goto bad;
 
+    buf[2] = 0; /* To shut up compiler warnings. */
     len = le32_to_cpu(buf[0]);
     role->value = le32_to_cpu(buf[1]);
     if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY )
@@ -1437,6 +1438,7 @@ static int user_read(struct policydb *p, struct hashtab *h, void *fp)
     if ( rc < 0 )
         goto bad;
 
+    buf[2] = 0; /* To shut up compiler warnings. */
     len = le32_to_cpu(buf[0]);
     usrdatum->value = le32_to_cpu(buf[1]);
     if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY )
-- 
2.4.3


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] xen/xsm: Shut up GCC 5.1.1 warnings.

[Julien Grall]

Hi Konrad,

On 16/09/15 14:45, Konrad Rzeszutek Wilk wrote:
> 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 makes no sense, as :
>  1). A couple of lines above it is being filled (buf[2]).

Not in every case, if p->policyvers < POLICYDB_VERSION_BOUNDARY, buf[2]
won't be initialized.

>  2). There are other instances of this which are not triggering this
>      failure.
> But GCC insists, and this patch stops the failures.
> 
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> ---
>  xen/xsm/flask/ss/policydb.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/xen/xsm/flask/ss/policydb.c b/xen/xsm/flask/ss/policydb.c
> index a1060b1..cee259c 100644
> --- a/xen/xsm/flask/ss/policydb.c
> +++ b/xen/xsm/flask/ss/policydb.c
> @@ -1274,6 +1274,7 @@ static int role_read(struct policydb *p, struct hashtab *h, void *fp)
>      if ( rc < 0 )
>          goto bad;
>  
> +    buf[2] = 0; /* To shut up compiler warnings. */

By doing this, you will override buf[2] when the policy version >=
POLICYDB_VERSION_BOUNDARY.

>      len = le32_to_cpu(buf[0]);
>      role->value = le32_to_cpu(buf[1]);
>      if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY )
> @@ -1437,6 +1438,7 @@ static int user_read(struct policydb *p, struct hashtab *h, void *fp)
>      if ( rc < 0 )
>          goto bad;
>  
> +    buf[2] = 0; /* To shut up compiler warnings. */

Ditto.

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

Regards,

-- 
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] xen/xsm: Shut up GCC 5.1.1 warnings.

[Konrad Rzeszutek Wilk]

On Wed, Sep 16, 2015 at 04:14:27PM +0100, Julien Grall wrote:
> Hi Konrad,
> 
> On 16/09/15 14:45, Konrad Rzeszutek Wilk wrote:
> > 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 makes no sense, as :
> >  1). A couple of lines above it is being filled (buf[2]).
> 
> Not in every case, if p->policyvers < POLICYDB_VERSION_BOUNDARY, buf[2]
> won't be initialized.
> 
> >  2). There are other instances of this which are not triggering this
> >      failure.
> > But GCC insists, and this patch stops the failures.
> > 
> > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> > ---
> >  xen/xsm/flask/ss/policydb.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/xen/xsm/flask/ss/policydb.c b/xen/xsm/flask/ss/policydb.c
> > index a1060b1..cee259c 100644
> > --- a/xen/xsm/flask/ss/policydb.c
> > +++ b/xen/xsm/flask/ss/policydb.c
> > @@ -1274,6 +1274,7 @@ static int role_read(struct policydb *p, struct hashtab *h, void *fp)
> >      if ( rc < 0 )
> >          goto bad;
> >  
> > +    buf[2] = 0; /* To shut up compiler warnings. */
> 
> By doing this, you will override buf[2] when the policy version >=
> POLICYDB_VERSION_BOUNDARY.
> 
> >      len = le32_to_cpu(buf[0]);
> >      role->value = le32_to_cpu(buf[1]);
> >      if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY )
> > @@ -1437,6 +1438,7 @@ static int user_read(struct policydb *p, struct hashtab *h, void *fp)
> >      if ( rc < 0 )
> >          goto bad;
> >  
> > +    buf[2] = 0; /* To shut up compiler warnings. */
> 
> Ditto.

Duh! I had it in a differente location in the earlier patch and
then moved down to make it after the 'goto bad'.

Thanks!
> 
> >      len = le32_to_cpu(buf[0]);
> >      usrdatum->value = le32_to_cpu(buf[1]);
> >      if ( p->policyvers >= POLICYDB_VERSION_BOUNDARY )
> > 
> 
> Regards,
> 
> -- 
> Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel