[PATCH v3] selinux: fix problems in netnode when BUG() is compiled out

[PATCH v3] selinux: fix problems in netnode when BUG() is compiled out

[Paul Moore]

When the BUG() macro is disabled at compile time it can cause some
problems in the SELinux netnode code: invalid return codes and
uninitialized variables.  This patch fixes this by making sure we take
some corrective action after the BUG() macro.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Paul Moore <pmoore@redhat.com>

---

In the process of cleaning up a local git tree I realized I had this
patch still sitting in my tree that for some reason hadn't been
merged upstream.  Originally sent back on December 5, 2012.
---
 security/selinux/netnode.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c
index c5454c0..03a72c3 100644
--- a/security/selinux/netnode.c
+++ b/security/selinux/netnode.c
@@ -166,6 +166,7 @@ static void sel_netnode_insert(struct sel_netnode *node)
 		break;
 	default:
 		BUG();
+		return;
 	}
 
 	/* we need to impose a limit on the growth of the hash table so check
@@ -225,6 +226,7 @@ static int sel_netnode_sid_slow(void *addr, u16 family, u32 *sid)
 		break;
 	default:
 		BUG();
+		ret = -EINVAL;
 	}
 	if (ret != 0)
 		goto out;


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: [PATCH v3] selinux: fix problems in netnode when BUG() is compiled out

[Paul Moore]

On Thursday, April 04, 2013 10:46:00 AM Paul Moore wrote:
> When the BUG() macro is disabled at compile time it can cause some
> problems in the SELinux netnode code: invalid return codes and
> uninitialized variables.  This patch fixes this by making sure we take
> some corrective action after the BUG() macro.
> 
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Signed-off-by: Paul Moore <pmoore@redhat.com>
> 
> ---
> 
> In the process of cleaning up a local git tree I realized I had this
> patch still sitting in my tree that for some reason hadn't been
> merged upstream.  Originally sent back on December 5, 2012.
> ---
>  security/selinux/netnode.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c
> index c5454c0..03a72c3 100644
> --- a/security/selinux/netnode.c
> +++ b/security/selinux/netnode.c
> @@ -166,6 +166,7 @@ static void sel_netnode_insert(struct sel_netnode *node)
> break;
>  	default:
>  		BUG();
> +		return;
>  	}
> 
>  	/* we need to impose a limit on the growth of the hash table so check
> @@ -225,6 +226,7 @@ static int sel_netnode_sid_slow(void *addr, u16 family,
> u32 *sid) break;
>  	default:
>  		BUG();
> +		ret = -EINVAL;
>  	}
>  	if (ret != 0)
>  		goto out;

It would be nice to get this into 3.10.

-- 
paul moore
security and virtualization @ redhat


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: [PATCH v3] selinux: fix problems in netnode when BUG() is compiled out

[Paul Moore]

On Monday, April 29, 2013 11:09:47 AM Paul Moore wrote:
> On Thursday, April 04, 2013 10:46:00 AM Paul Moore wrote:
> > When the BUG() macro is disabled at compile time it can cause some
> > problems in the SELinux netnode code: invalid return codes and
> > uninitialized variables.  This patch fixes this by making sure we take
> > some corrective action after the BUG() macro.
> > 
> > Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> > Signed-off-by: Paul Moore <pmoore@redhat.com>
> > 
> > ---
> > 
> > In the process of cleaning up a local git tree I realized I had this
> > patch still sitting in my tree that for some reason hadn't been
> > merged upstream.  Originally sent back on December 5, 2012.
> > ---
> > 
> >  security/selinux/netnode.c |    2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c
> > index c5454c0..03a72c3 100644
> > --- a/security/selinux/netnode.c
> > +++ b/security/selinux/netnode.c
> > @@ -166,6 +166,7 @@ static void sel_netnode_insert(struct sel_netnode
> > *node) break;
> > 
> >  	default:
> >  		BUG();
> > 
> > +		return;
> > 
> >  	}
> >  	
> >  	/* we need to impose a limit on the growth of the hash table so check
> > 
> > @@ -225,6 +226,7 @@ static int sel_netnode_sid_slow(void *addr, u16
> > family,
> > u32 *sid) break;
> > 
> >  	default:
> >  		BUG();
> > 
> > +		ret = -EINVAL;
> > 
> >  	}
> >  	if (ret != 0)
> >  	
> >  		goto out;
> 
> It would be nice to get this into 3.10.

*COUGH*
Hello?  3.10?  Hello?
*COUGH*

-- 
paul moore
security and virtualization @ redhat


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.