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

Commit c2f29cd4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "selinux: update netlink socket classes"

parents a64cd2cd eea41348

security/selinux/hooks.c

+16 −4
Original line number Diff line number Diff line
@@ -1204,8 +1204,6 @@ static inline u16 socket_type_to_security_class(int family, int type, int protoc 
		switch (protocol) {

		case NETLINK_ROUTE:

			return SECCLASS_NETLINK_ROUTE_SOCKET;

		case NETLINK_FIREWALL:

			return SECCLASS_NETLINK_FIREWALL_SOCKET;

		case NETLINK_SOCK_DIAG:

			return SECCLASS_NETLINK_TCPDIAG_SOCKET;

		case NETLINK_NFLOG:
@@ -1214,14 +1212,28 @@ static inline u16 socket_type_to_security_class(int family, int type, int protoc 
			return SECCLASS_NETLINK_XFRM_SOCKET;

		case NETLINK_SELINUX:

			return SECCLASS_NETLINK_SELINUX_SOCKET;

		case NETLINK_ISCSI:

			return SECCLASS_NETLINK_ISCSI_SOCKET;

		case NETLINK_AUDIT:

			return SECCLASS_NETLINK_AUDIT_SOCKET;

		case NETLINK_IP6_FW:

			return SECCLASS_NETLINK_IP6FW_SOCKET;

		case NETLINK_FIB_LOOKUP:

			return SECCLASS_NETLINK_FIB_LOOKUP_SOCKET;

		case NETLINK_CONNECTOR:

			return SECCLASS_NETLINK_CONNECTOR_SOCKET;

		case NETLINK_NETFILTER:

			return SECCLASS_NETLINK_NETFILTER_SOCKET;

		case NETLINK_DNRTMSG:

			return SECCLASS_NETLINK_DNRT_SOCKET;

		case NETLINK_KOBJECT_UEVENT:

			return SECCLASS_NETLINK_KOBJECT_UEVENT_SOCKET;

		case NETLINK_GENERIC:

			return SECCLASS_NETLINK_GENERIC_SOCKET;

		case NETLINK_SCSITRANSPORT:

			return SECCLASS_NETLINK_SCSITRANSPORT_SOCKET;

		case NETLINK_RDMA:

			return SECCLASS_NETLINK_RDMA_SOCKET;

		case NETLINK_CRYPTO:

			return SECCLASS_NETLINK_CRYPTO_SOCKET;

		default:

			return SECCLASS_NETLINK_SOCKET;

		}

security/selinux/include/classmap.h

+16 −6
Original line number Diff line number Diff line
@@ -101,9 +101,6 @@ struct security_class_mapping secclass_map[] = { 
	{ "netlink_route_socket",

	  { COMMON_SOCK_PERMS,

	    "nlmsg_read", "nlmsg_write", NULL } },

	{ "netlink_firewall_socket",

	  { COMMON_SOCK_PERMS,

	    "nlmsg_read", "nlmsg_write", NULL } },

	{ "netlink_tcpdiag_socket",

	  { COMMON_SOCK_PERMS,

	    "nlmsg_read", "nlmsg_write", NULL } },
@@ -114,19 +111,32 @@ struct security_class_mapping secclass_map[] = { 
	    "nlmsg_read", "nlmsg_write", NULL } },

	{ "netlink_selinux_socket",

	  { COMMON_SOCK_PERMS, NULL } },

	{ "netlink_iscsi_socket",

	  { COMMON_SOCK_PERMS, NULL } },

	{ "netlink_audit_socket",

	  { COMMON_SOCK_PERMS,

	    "nlmsg_read", "nlmsg_write", "nlmsg_relay", "nlmsg_readpriv",

	    "nlmsg_tty_audit", NULL } },

	{ "netlink_ip6fw_socket",

	  { COMMON_SOCK_PERMS,

	    "nlmsg_read", "nlmsg_write", NULL } },

	{ "netlink_fib_lookup_socket",

	  { COMMON_SOCK_PERMS, NULL } },

	{ "netlink_connector_socket",

	  { COMMON_SOCK_PERMS, NULL } },

	{ "netlink_netfilter_socket",

	  { COMMON_SOCK_PERMS, NULL } },

	{ "netlink_dnrt_socket",

	  { COMMON_SOCK_PERMS, NULL } },

	{ "association",

	  { "sendto", "recvfrom", "setcontext", "polmatch", NULL } },

	{ "netlink_kobject_uevent_socket",

	  { COMMON_SOCK_PERMS, NULL } },

	{ "netlink_generic_socket",

	  { COMMON_SOCK_PERMS, NULL } },

	{ "netlink_scsitransport_socket",

	  { COMMON_SOCK_PERMS, NULL } },

	{ "netlink_rdma_socket",

	  { COMMON_SOCK_PERMS, NULL } },

	{ "netlink_crypto_socket",

	  { COMMON_SOCK_PERMS, NULL } },

	{ "appletalk_socket",

	  { COMMON_SOCK_PERMS, NULL } },

	{ "packet",