diff options
author | Linus Torvalds | 2014-02-10 03:14:53 +0100 |
---|---|---|
committer | Linus Torvalds | 2014-02-10 03:14:53 +0100 |
commit | cd63204c55a207873eee1e8e225bccc9ae27d949 (patch) | |
tree | cf5fa6ad8839a62cbc82e64e578d0ff7f05928d2 /security/selinux/nlmsgtab.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
parent | Merge branch 'stable-3.14' of git://git.infradead.org/users/pcmoore/selinux i... (diff) | |
download | kernel-qcow2-linux-cd63204c55a207873eee1e8e225bccc9ae27d949.tar.gz kernel-qcow2-linux-cd63204c55a207873eee1e8e225bccc9ae27d949.tar.xz kernel-qcow2-linux-cd63204c55a207873eee1e8e225bccc9ae27d949.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull SELinux fixes from James Morris.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
SELinux: Fix kernel BUG on empty security contexts.
selinux: add SOCK_DIAG_BY_FAMILY to the list of netlink message types
Diffstat (limited to 'security/selinux/nlmsgtab.c')
-rw-r--r-- | security/selinux/nlmsgtab.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/selinux/nlmsgtab.c b/security/selinux/nlmsgtab.c index 332ac8a80cf5..2df7b900e259 100644 --- a/security/selinux/nlmsgtab.c +++ b/security/selinux/nlmsgtab.c @@ -17,6 +17,7 @@ #include <linux/inet_diag.h> #include <linux/xfrm.h> #include <linux/audit.h> +#include <linux/sock_diag.h> #include "flask.h" #include "av_permissions.h" @@ -78,6 +79,7 @@ static struct nlmsg_perm nlmsg_tcpdiag_perms[] = { { TCPDIAG_GETSOCK, NETLINK_TCPDIAG_SOCKET__NLMSG_READ }, { DCCPDIAG_GETSOCK, NETLINK_TCPDIAG_SOCKET__NLMSG_READ }, + { SOCK_DIAG_BY_FAMILY, NETLINK_TCPDIAG_SOCKET__NLMSG_READ }, }; static struct nlmsg_perm nlmsg_xfrm_perms[] = |