diff options
| author | Ingo Molnar | 2013-12-16 14:51:32 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2013-12-16 14:51:32 +0100 |
| commit | fe361cfcf40ad4612226347573a8669cd0d44799 (patch) | |
| tree | e874ef5a29c3bfe3dd67dc2d8962562c00fc8e3a /security/selinux/selinuxfs.c | |
| parent | perf: Optimize ring-buffer write by depending on control dependencies (diff) | |
| parent | Linux 3.13-rc4 (diff) | |
| download | kernel-qcow2-linux-fe361cfcf40ad4612226347573a8669cd0d44799.tar.gz kernel-qcow2-linux-fe361cfcf40ad4612226347573a8669cd0d44799.tar.xz kernel-qcow2-linux-fe361cfcf40ad4612226347573a8669cd0d44799.zip | |
Merge tag 'v3.13-rc4' into perf/core
Merge Linux 3.13-rc4, to refresh this branch with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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; |