From b8329fc2c9eb4e1cf38e10d5364d9826b7b7cab7 Mon Sep 17 00:00:00 2001
From: James Morris <jmorris@namei.org>
Date: Mon, 15 Aug 2005 20:34:48 -0700
Subject: [PATCH] --- yaml --- r: 6371 b: refs/heads/master c:
 216efaaaa006d2f3ecbb5bbc2b6673423813254e h: refs/heads/master i:   6369:
 78f4ee7d638b49b637f5a3c9a605018ba7ca3fea   6367:
 c7598217dc29f3e3a6739415d23b297d953ee20e v: v3

---
 [refs]                            | 2 +-
 trunk/security/selinux/hooks.c    | 2 +-
 trunk/security/selinux/nlmsgtab.c | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b88fc8703e45..d715e55544ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 066286071d3542243baa68166acb779187c848b3
+refs/heads/master: 216efaaaa006d2f3ecbb5bbc2b6673423813254e
diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c
index 2253f388234f..8641f8894b4c 100644
--- a/trunk/security/selinux/hooks.c
+++ b/trunk/security/selinux/hooks.c
@@ -659,7 +659,7 @@ static inline u16 socket_type_to_security_class(int family, int type, int protoc
 			return 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;
diff --git a/trunk/security/selinux/nlmsgtab.c b/trunk/security/selinux/nlmsgtab.c
index 92b057becb4b..69b9329b2054 100644
--- a/trunk/security/selinux/nlmsgtab.c
+++ b/trunk/security/selinux/nlmsgtab.c
@@ -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_perms[] =
 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[] =