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

[PATCH] 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>
---
 security/selinux/netnode.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c
index c5454c0..9e0048a 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,8 @@ static int sel_netnode_sid_slow(void *addr, u16 family, u32 *sid)
 		break;
 	default:
 		BUG();
+		ret = -EINVAL;
+		goto out;
 	}
 	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] selinux: fix problems in netnode when BUG() is compiled out

[Paul Moore]

On Wednesday, December 05, 2012 03:58:12 PM 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>
> ---
>  security/selinux/netnode.c |    3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c
> index c5454c0..9e0048a 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,8 @@ static int sel_netnode_sid_slow(void *addr, u16 family,
> u32 *sid) break;
>  	default:
>  		BUG();
> +		ret = -EINVAL;
> +		goto out;
>  	}
>  	if (ret != 0)
>  		goto out;

Ooops, scratch this patch.

-- 
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.