Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / security / selinux / nlmsgtab.c

diff --git a/security/selinux/nlmsgtab.c b/security/selinux/nlmsgtab.c
index 0920ea3bf59936245ac1e495b25a1b7867bc614d..d309e7f472d86ae7010f99edba87ced2c0957727 100644 (file)
--- a/security/selinux/nlmsgtab.c
+++ b/security/selinux/nlmsgtab.c
@@ -14,7 +14,6 @@
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #include <linux/if.h>
-#include <linux/netfilter_ipv4/ip_queue.h>
 #include <linux/inet_diag.h>
 #include <linux/xfrm.h>
 #include <linux/audit.h>
@@ -70,12 +69,6 @@ static struct nlmsg_perm nlmsg_route_perms[] =
        { RTM_SETDCB,           NETLINK_ROUTE_SOCKET__NLMSG_WRITE },
 };
 
-static struct nlmsg_perm nlmsg_firewall_perms[] =
-{
-       { IPQM_MODE,            NETLINK_FIREWALL_SOCKET__NLMSG_WRITE },
-       { IPQM_VERDICT,         NETLINK_FIREWALL_SOCKET__NLMSG_WRITE },
-};
-
 static struct nlmsg_perm nlmsg_tcpdiag_perms[] =
 {
        { TCPDIAG_GETSOCK,      NETLINK_TCPDIAG_SOCKET__NLMSG_READ },
@@ -145,12 +138,6 @@ int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm)
                                 sizeof(nlmsg_route_perms));
                break;
 
-       case SECCLASS_NETLINK_FIREWALL_SOCKET:
-       case SECCLASS_NETLINK_IP6FW_SOCKET:
-               err = nlmsg_perm(nlmsg_type, perm, nlmsg_firewall_perms,
-                                sizeof(nlmsg_firewall_perms));
-               break;
-
        case SECCLASS_NETLINK_TCPDIAG_SOCKET:
                err = nlmsg_perm(nlmsg_type, perm, nlmsg_tcpdiag_perms,
                                 sizeof(nlmsg_tcpdiag_perms));