Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 216efaaa authored by James Morris's avatar James Morris Committed by David S. Miller
Browse files

[SELINUX]: Update for tcp_diag rename to inet_diag. 



Also, support dccp sockets.

Signed-off-by: default avatarJames Morris <jmorris@namei.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 06628607

security/selinux/hooks.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

security/selinux/nlmsgtab.c

+2 −1
Original line number Diff line number Diff line
@@ -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[] =