diff options
| author | Paul Moore <[email protected]> | 2013-09-18 17:52:20 +0000 |
|---|---|---|
| committer | Paul Moore <[email protected]> | 2013-09-18 17:52:20 +0000 |
| commit | 98f700f317967d45cf60c9843b3c42ce3c286f7c (patch) | |
| tree | 2e68b189ceb954182af56b8f6febe644119b7cd7 /security/selinux/selinuxfs.c | |
| parent | Linux 3.11 (diff) | |
| parent | Revert "SELinux: do not handle seclabel as a special flag" (diff) | |
| download | kernel-98f700f317967d45cf60c9843b3c42ce3c286f7c.tar.gz kernel-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/selinuxfs.c')
| -rw-r--r-- | security/selinux/selinuxfs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index ff427733c290..5122affe06a8 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -44,7 +44,9 @@ /* Policy capability filenames */ static char *policycap_names[] = { "network_peer_controls", - "open_perms" + "open_perms", + "redhat1", + "always_check_network" }; unsigned int selinux_checkreqprot = CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE; |