diff options
| author | Paul Moore <pmoore@redhat.com> | 2013-09-18 13:52:20 -0400 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2013-09-18 13:52:20 -0400 |
| commit | 98f700f317967d45cf60c9843b3c42ce3c286f7c (patch) | |
| tree | 2e68b189ceb954182af56b8f6febe644119b7cd7 /security/selinux/netnode.c | |
| parent | 6e4664525b1db28f8c4e1130957f70a94c19213e (diff) | |
| parent | 0b4bdb3573a86a88c829b9e4ad702859eb923e7e (diff) | |
| download | blackbird-op-linux-98f700f317967d45cf60c9843b3c42ce3c286f7c.tar.gz blackbird-op-linux-98f700f317967d45cf60c9843b3c42ce3c286f7c.zip | |
Merge git://git.infradead.org/users/eparis/selinux
Conflicts:
security/selinux/hooks.c
Pull Eric's existing SELinux tree as there are a number of patches in
there that are not yet upstream. There was some minor fixup needed to
resolve a conflict in security/selinux/hooks.c:selinux_set_mnt_opts()
between the labeled NFS patches and Eric's security_fs_use()
simplification patch.
Diffstat (limited to 'security/selinux/netnode.c')
| -rw-r--r-- | security/selinux/netnode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c index c5454c0477c3..03a72c32afd7 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; |
