Skip to contentSkip to conversation

selinux: use netlink_receive hook

PATCH In review Jeff Vander Stoep 2 participants 3 messages Aug 21, 2019 – Aug 23, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 2/2 selinux: use netlink_receive hook

Add the nlmsg_readpriv permission to netlink_route socket class. Currently this is only used to restrict MAC address access.

---
 security/selinux/hooks.c            | 6 ++++++
 security/selinux/include/classmap.h | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
security/selinux/hooks.c +6 -0
index 74dd46de01b6..2ab89a73f663 100644
@@ -5825,6 +5825,11 @@ static unsigned int selinux_ipv6_postroute(void *priv,
 
 #endif	/* CONFIG_NETFILTER */
 
+static int selinux_netlink_receive(struct sock *sk, struct sk_buff *skb)
+{
+	return sock_has_perm(current, sk, NETLINK_ROUTE_SOCKET__NLMSG_READPRIV);
+}
+
 static int selinux_netlink_send(struct sock *sk, struct sk_buff *skb)
 {
 	return selinux_nlmsg_perm(sk, skb);
@@ -6765,6 +6770,7 @@ static struct security_hook_list selinux_hooks[] __lsm_ro_after_init = {
 	LSM_HOOK_INIT(syslog, selinux_syslog),
 	LSM_HOOK_INIT(vm_enough_memory, selinux_vm_enough_memory),
 
+	LSM_HOOK_INIT(netlink_receive, selinux_netlink_receive),
 	LSM_HOOK_INIT(netlink_send, selinux_netlink_send),
 
 	LSM_HOOK_INIT(bprm_set_creds, selinux_bprm_set_creds),
security/selinux/include/classmap.h +1 -1
index 201f7e588a29..3726c61a3dd1 100644
@@ -115,7 +115,7 @@ struct security_class_mapping secclass_map[] = {
 	  { COMMON_IPC_PERMS, NULL } },
 	{ "netlink_route_socket",
 	  { COMMON_SOCK_PERMS,
-	    "nlmsg_read", "nlmsg_write", NULL } },
+	    "nlmsg_read", "nlmsg_write", "nlmsg_readpriv", NULL } },
 	{ "netlink_tcpdiag_socket",
 	  { COMMON_SOCK_PERMS,
 	    "nlmsg_read", "nlmsg_write", NULL } },
Signature · 1 line
2.23.0.rc1.153.gdeed80330f-goog
#1 lore raw
Thank you for the patch! Yet something to improve:

Hi Jeff,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on linus/master]
[cannot apply to v5.3-rc5 next-20190822]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url: https://github.com/0day-ci/linux/commits/Jeff-Vander-Stoep/rtnetlink-gate-MAC-address-with-an-LSM-hook/20190823-071253
config: i386-defconfig (attached as .config)
compiler: gcc-7 (Debian 7.4.0-10) 7.4.0 reproduce:

        # save the attached .config to linux build tree
        make ARCH=i386 

If you fix the issue, kindly add following tag

All error/warnings (new ones prefixed by >>):

In file included from include/linux/sched.h:12:0,
from include/linux/tracehook.h:46, from security/selinux/hooks.c:27:
security/selinux/hooks.c: In function 'selinux_netlink_receive':

>> arch/x86/include/asm/current.h:18:17: error: passing argument 1 of 'sock_has_perm' from incompatible pointer type [-Werror=incompatible-pointer-types]
    #define current get_current()
                    ^
>> security/selinux/hooks.c:5830:23: note: in expansion of macro 'current'
     return sock_has_perm(current, sk, NETLINK_ROUTE_SOCKET__NLMSG_READPRIV);
                          ^~~~~~~
   security/selinux/hooks.c:4422:12: note: expected 'struct sock *' but argument is of type 'struct task_struct *'
    static int sock_has_perm(struct sock *sk, u32 perms)
               ^~~~~~~~~~~~~
>> security/selinux/hooks.c:5830:32: warning: passing argument 2 of 'sock_has_perm' makes integer from pointer without a cast [-Wint-conversion]
     return sock_has_perm(current, sk, NETLINK_ROUTE_SOCKET__NLMSG_READPRIV);
                                   ^~
   security/selinux/hooks.c:4422:12: note: expected 'u32 {aka unsigned int}' but argument is of type 'struct sock *'
    static int sock_has_perm(struct sock *sk, u32 perms)
               ^~~~~~~~~~~~~
>> security/selinux/hooks.c:5830:9: error: too many arguments to function 'sock_has_perm'
     return sock_has_perm(current, sk, NETLINK_ROUTE_SOCKET__NLMSG_READPRIV);
            ^~~~~~~~~~~~~

security/selinux/hooks.c:4422:12: note: declared here
static int sock_has_perm(struct sock *sk, u32 perms)
^~~~~~~~~~~~~
cc1: some warnings being treated as errors

vim +/sock_has_perm +18 arch/x86/include/asm/current.h

f0766440dda7ac include/asm-x86/current.h Christoph Lameter 2008-05-09 17
c6f5e0acd5d12e arch/x86/include/asm/current.h Brian Gerst 2009-01-19 @18 #define current get_current()
f0766440dda7ac include/asm-x86/current.h Christoph Lameter 2008-05-09 19

:::::: The code at line 18 was first introduced by commit
:::::: c6f5e0acd5d12ee23f701f15889872e67b47caa6 x86-64: Move current task from PDA to per-cpu and consolidate with 32-bit.

:::::: TO: Brian Gerst <[email protected]> :::::: CC: Tejun Heo <[email protected]>

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

#2 lore raw
In reply to Jeff Vander Stoep
Thank you for the patch! Yet something to improve:

Hi Jeff,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on linus/master]
[cannot apply to v5.3-rc5 next-20190822]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url: https://github.com/0day-ci/linux/commits/Jeff-Vander-Stoep/rtnetlink-gate-MAC-address-with-an-LSM-hook/20190823-071253
config: s390-debug_defconfig (attached as .config)
compiler: s390-linux-gcc (GCC) 7.4.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=7.4.0 make.cross ARCH=s390

If you fix the issue, kindly add following tag

All errors (new ones prefixed by >>):

In file included from include/linux/sched.h:12:0,
from include/linux/tracehook.h:46, from security/selinux/hooks.c:27:
security/selinux/hooks.c: In function 'selinux_netlink_receive':

>> arch/s390/include/asm/current.h:17:17: error: passing argument 1 of 'sock_has_perm' from incompatible pointer type [-Werror=incompatible-pointer-types]
    #define current ((struct task_struct *const)S390_lowcore.current_task)
                    ^
   security/selinux/hooks.c:5830:23: note: in expansion of macro 'current'
     return sock_has_perm(current, sk, NETLINK_ROUTE_SOCKET__NLMSG_READPRIV);
                          ^~~~~~~
   security/selinux/hooks.c:4422:12: note: expected 'struct sock *' but argument is of type 'struct task_struct *'
    static int sock_has_perm(struct sock *sk, u32 perms)
               ^~~~~~~~~~~~~
   security/selinux/hooks.c:5830:32: warning: passing argument 2 of 'sock_has_perm' makes integer from pointer without a cast [-Wint-conversion]
     return sock_has_perm(current, sk, NETLINK_ROUTE_SOCKET__NLMSG_READPRIV);
                                   ^~
   security/selinux/hooks.c:4422:12: note: expected 'u32 {aka unsigned int}' but argument is of type 'struct sock *'
    static int sock_has_perm(struct sock *sk, u32 perms)
               ^~~~~~~~~~~~~
   security/selinux/hooks.c:5830:9: error: too many arguments to function 'sock_has_perm'
     return sock_has_perm(current, sk, NETLINK_ROUTE_SOCKET__NLMSG_READPRIV);
            ^~~~~~~~~~~~~

security/selinux/hooks.c:4422:12: note: declared here
static int sock_has_perm(struct sock *sk, u32 perms)
^~~~~~~~~~~~~
cc1: some warnings being treated as errors

vim +/sock_has_perm +17 arch/s390/include/asm/current.h

^1da177e4c3f41 include/asm-s390/current.h Linus Torvalds 2005-04-16 16
^1da177e4c3f41 include/asm-s390/current.h Linus Torvalds 2005-04-16 @17 #define current ((struct task_struct *const)S390_lowcore.current_task) ^1da177e4c3f41 include/asm-s390/current.h Linus Torvalds 2005-04-16 18

:::::: The code at line 17 was first introduced by commit :::::: 1da177e4c3f41524e886b7f1b8a0c1fc7321cac2 Linux-2.6.12-rc2

:::::: TO: Linus Torvalds <[email protected]> :::::: CC: Linus Torvalds <[email protected]>

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation