git-net-selinux-build-fix.patch added to -mm tree (fwd)
Forgot to cc lkml.
---------- Forwarded message ----------
Date: Mon, 15 Aug 2005 23:00:10 -0400 (EDT)
From: James Morris <[email protected]>
To: [email protected]
Cc: David S. Miller <[email protected]>, Stephen Smalley <[email protected]>
Subject: Re: git-net-selinux-build-fix.patch added to -mm tree
Please use this patch instead so that we catch the new DCCP message type.
Signed-off-by James Morris <[email protected]>
---
security/selinux/hooks.c | 2 +- security/selinux/nlmsgtab.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
security/selinux/hooks.c +1 -1
@@ -659,7 +659,7 @@ static inline u16 socket_type_to_securitreturn SECCLASS_NETLINK_ROUTE_SOCKET ;case NETLINK_FIREWALL :return SECCLASS_NETLINK_FIREWALL_SOCKET ; -case NETLINK_TCPDIAG : +case NETLINK_INET_DIAG :return SECCLASS_NETLINK_TCPDIAG_SOCKET ;case NETLINK_NFLOG :return SECCLASS_NETLINK_NFLOG_SOCKET ;
security/selinux/nlmsgtab.c +2 -1
@@ -16,7 +16,7 @@#include <linux/rtnetlink.h> #include <linux/if.h> #include <linux/netfilter_ipv4/ip_queue.h> -#include <linux/tcp_diag.h> +#include <linux/inet_diag.h> #include <linux/xfrm.h> #include <linux/audit.h>
@@ -76,6 +76,7 @@ static struct nlmsg_perm nlmsg_firewall_static struct nlmsg_perm nlmsg_tcpdiag_perms[] = { {TCPDIAG_GETSOCK ,NETLINK_TCPDIAG_SOCKET__NLMSG_READ }, + {DCCPDIAG_GETSOCK ,NETLINK_TCPDIAG_SOCKET__NLMSG_READ }, }; static struct nlmsg_perm nlmsg_xfrm_perms[] =