From 0ac26f355378f4839cf1d5938ebe84fd1cd71a70 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Wed, 20 Apr 2011 10:21:28 -0400
Subject: [PATCH] --- yaml --- r: 250789 b: refs/heads/master c:
 a35c6c8368d88deae6890205e73ed330b6df1db7 h: refs/heads/master i:   250787:
 b0ff07286724c3d049b03fe3fff6fc57d2973c9e v: v3

---
 [refs]                           | 2 +-
 trunk/security/selinux/hooks.c   | 2 ++
 trunk/security/selinux/netnode.c | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f1441dab1470..640dcad2c8ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 425b473de5372cad6fffc6b98a758ed8e3fc70ce
+refs/heads/master: a35c6c8368d88deae6890205e73ed330b6df1db7
diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c
index d52a92507412..7a630a8a5cef 100644
--- a/trunk/security/selinux/hooks.c
+++ b/trunk/security/selinux/hooks.c
@@ -989,6 +989,7 @@ static void selinux_write_opts(struct seq_file *m,
 			continue;
 		default:
 			BUG();
+			return;
 		};
 		/* we need a comma before each option */
 		seq_putc(m, ',');
@@ -1442,6 +1443,7 @@ static int task_has_capability(struct task_struct *tsk,
 		printk(KERN_ERR
 		       "SELinux:  out of range capability %d\n", cap);
 		BUG();
+		return -EINVAL;
 	}
 
 	rc = avc_has_perm_noaudit(sid, sid, sclass, av, 0, &avd);
diff --git a/trunk/security/selinux/netnode.c b/trunk/security/selinux/netnode.c
index 65ebfe954f85..3618251d0fdb 100644
--- a/trunk/security/selinux/netnode.c
+++ b/trunk/security/selinux/netnode.c
@@ -141,6 +141,7 @@ static struct sel_netnode *sel_netnode_find(const void *addr, u16 family)
 		break;
 	default:
 		BUG();
+		return NULL;
 	}
 
 	list_for_each_entry_rcu(node, &sel_netnode_hash[idx].list, list)