diff options
| author | Eric Paris <eparis@redhat.com> | 2011-04-20 18:21:28 +0400 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2011-04-25 18:18:27 +0400 |
| commit | a35c6c8368d88deae6890205e73ed330b6df1db7 (patch) | |
| tree | f61c3da7460bb5ab39353404456d92e005e9000e | |
| parent | 425b473de5372cad6fffc6b98a758ed8e3fc70ce (diff) | |
| download | linux-a35c6c8368d88deae6890205e73ed330b6df1db7.tar.xz | |
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, 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/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) break; default: BUG(); + return NULL; } list_for_each_entry_rcu(node, &sel_netnode_hash[idx].list, list) |