diff options
author | Eric Paris <eparis@redhat.com> | 2011-04-20 10:21:28 -0400 |
---|---|---|
committer | Eric Paris <eparis@redhat.com> | 2011-04-25 10:18:27 -0400 |
commit | a35c6c8368d88deae6890205e73ed330b6df1db7 (patch) | |
tree | f61c3da7460bb5ab39353404456d92e005e9000e | |
parent | 425b473de5372cad6fffc6b98a758ed8e3fc70ce (diff) |
SELinux: silence build warning when !CONFIG_BUG
If one builds a kernel without CONFIG_BUG there are a number of 'may be
used uninitialized' warnings. Silence these by returning after the BUG().
Signed-off-by: Eric Paris <eparis@redhat.com>
Reviewed-by: James Morris <jmorris@namei.org>
-rw-r--r-- | security/selinux/hooks.c | 2 | ||||
-rw-r--r-- | security/selinux/netnode.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index d52a92507412..7a630a8a5cef 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -989,6 +989,7 @@ static void selinux_write_opts(struct seq_file *m, | |||
989 | continue; | 989 | continue; |
990 | default: | 990 | default: |
991 | BUG(); | 991 | BUG(); |
992 | return; | ||
992 | }; | 993 | }; |
993 | /* we need a comma before each option */ | 994 | /* we need a comma before each option */ |
994 | seq_putc(m, ','); | 995 | seq_putc(m, ','); |
@@ -1442,6 +1443,7 @@ static int task_has_capability(struct task_struct *tsk, | |||
1442 | printk(KERN_ERR | 1443 | printk(KERN_ERR |
1443 | "SELinux: out of range capability %d\n", cap); | 1444 | "SELinux: out of range capability %d\n", cap); |
1444 | BUG(); | 1445 | BUG(); |
1446 | return -EINVAL; | ||
1445 | } | 1447 | } |
1446 | 1448 | ||
1447 | rc = avc_has_perm_noaudit(sid, sid, sclass, av, 0, &avd); | 1449 | rc = avc_has_perm_noaudit(sid, sid, sclass, av, 0, &avd); |
diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c index 65ebfe954f85..3618251d0fdb 100644 --- a/security/selinux/netnode.c +++ b/security/selinux/netnode.c | |||
@@ -141,6 +141,7 @@ static struct sel_netnode *sel_netnode_find(const void *addr, u16 family) | |||
141 | break; | 141 | break; |
142 | default: | 142 | default: |
143 | BUG(); | 143 | BUG(); |
144 | return NULL; | ||
144 | } | 145 | } |
145 | 146 | ||
146 | list_for_each_entry_rcu(node, &sel_netnode_hash[idx].list, list) | 147 | list_for_each_entry_rcu(node, &sel_netnode_hash[idx].list, list) |