From patchwork Wed Aug 21 13:45:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffrey Vander Stoep X-Patchwork-Id: 11106795 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 60C261813 for ; Wed, 21 Aug 2019 13:45:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EF35233A0 for ; Wed, 21 Aug 2019 13:45:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gHkey7/P" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728788AbfHUNp4 (ORCPT ); Wed, 21 Aug 2019 09:45:56 -0400 Received: from mail-qk1-f202.google.com ([209.85.222.202]:48857 "EHLO mail-qk1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728716AbfHUNp4 (ORCPT ); Wed, 21 Aug 2019 09:45:56 -0400 Received: by mail-qk1-f202.google.com with SMTP id k5so2138863qke.15 for ; Wed, 21 Aug 2019 06:45:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=VdxLqqxvQ1VVL4avZcCP2yW2lIouW/66kNiFtbKiPXE=; b=gHkey7/PD0UJhXQQW4Ne8NtSP3Z8k+K80R5bIzurTx910qku1Vp/kva0nYk/9F3YUb WrlMXwuWYDYMRH7FV2Prs8R2WXc9uj+RTVwVQYL4zFV/bS/tAaz2jIph3vMZHchvNMyF 81rzpX5DOlmIlnSkNy+wtLoLjrLIJyZuEvOCaw9idbJUDXE3dC11gOv77hNSmF68kgy0 dhBcoGTUWHlmNa8EchhunYFu4iNWr12/Mw9mzVAiL1Jgcud8eFpisaRcJjGNXysg9gbi 6Pf0t2zmsTvdjfa1t3faLaFs8KMxp1utvD1aPs9RiR14Kpp+n/SX5yQQgdCHFRT/ZvuP NAwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=VdxLqqxvQ1VVL4avZcCP2yW2lIouW/66kNiFtbKiPXE=; b=NTxFlbCAW7w5GmMzUX+H+rX//zMv/wFWCGahGi1pT1tKN2PJ3ynk/EtbCMYlcZQsiW XBKBkhYuSSjKqFUqYlkOO0C9PfX+NCx5NuvQGb3MU+739hi4mbnij52UDKFv2wCJtYo2 u9uBIvvuM+z4VDXNCVgGyWPI+lGxB2HgXFuzzUWfacOrv9copQroDNLf3Ek/xxdHD2kM VCLs35FUHSyRhyM8xGPJXMM1sv/nThJTLmCL/0uW1OKqwibnWxrTrqFNswxzO/Lp2AYm FFOHW15fpzNvrpwVxVDCcwbSnZLBoVvuUo1CuxOiohwXpHCmK1N+nChfKZ8ooMMjvx5O rFnA== X-Gm-Message-State: APjAAAWMBkC5PljjQh7leHcSTsxiI4Xq20L1W4LrJw+cZSffg4CZTQ7U 7TTQi7yRHuvQ4KCvdZ6tGqmUBZbWhw== X-Google-Smtp-Source: APXvYqxnhmNIUPYTp4W5dlnL3rMXrWtp2gSX8a3JW01dlQM5PCQUUxjjpcVLLvN0hGeKH2QuSr9cWiZKQg== X-Received: by 2002:a37:7404:: with SMTP id p4mr15572175qkc.476.1566395154861; Wed, 21 Aug 2019 06:45:54 -0700 (PDT) Date: Wed, 21 Aug 2019 15:45:47 +0200 Message-Id: <20190821134547.96929-1-jeffv@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog Subject: [PATCH 1/2] rtnetlink: gate MAC address with an LSM hook From: Jeff Vander Stoep To: netdev@vger.kernel.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Cc: Jeff Vander Stoep Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: MAC addresses are often considered sensitive because they are usually unique and can be used to identify/track a device or user [1]. The MAC address is accessible via the RTM_NEWLINK message type of a netlink route socket[2]. Ideally we could grant/deny access to the MAC address on a case-by-case basis without blocking the entire RTM_NEWLINK message type which contains a lot of other useful information. This can be achieved using a new LSM hook on the netlink message receive path. Using this new hook, individual LSMs can select which processes are allowed access to the real MAC, otherwise a default value of zeros is returned. Offloading access control decisions like this to an LSM is convenient because it preserves the status quo for most Linux users while giving the various LSMs flexibility to make finer grained decisions on access to sensitive data based on policy. [1] https://adamdrake.com/mac-addresses-udids-and-privacy.html [2] Other access vectors like ioctl(SIOCGIFHWADDR) are already covered by existing LSM hooks. Signed-off-by: Jeff Vander Stoep --- include/linux/lsm_hooks.h | 8 ++++++++ include/linux/security.h | 6 ++++++ net/core/rtnetlink.c | 12 ++++++++++-- security/security.c | 5 +++++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index df1318d85f7d..dfcb2e11ff43 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -728,6 +728,12 @@ * * Security hooks for Netlink messaging. * + * @netlink_receive + * Check permissions on a netlink message field before populating it. + * @sk associated sock of task receiving the message. + * @skb contains the sk_buff structure for the netlink message. + * Return 0 if the data should be included in the message. + * * @netlink_send: * Save security information for a netlink message so that permission * checking can be performed when the message is processed. The security @@ -1673,6 +1679,7 @@ union security_list_options { int (*sem_semop)(struct kern_ipc_perm *perm, struct sembuf *sops, unsigned nsops, int alter); + int (*netlink_receive)(struct sock *sk, struct sk_buff *skb); int (*netlink_send)(struct sock *sk, struct sk_buff *skb); void (*d_instantiate)(struct dentry *dentry, struct inode *inode); @@ -1952,6 +1959,7 @@ struct security_hook_heads { struct hlist_head sem_associate; struct hlist_head sem_semctl; struct hlist_head sem_semop; + struct hlist_head netlink_receive; struct hlist_head netlink_send; struct hlist_head d_instantiate; struct hlist_head getprocattr; diff --git a/include/linux/security.h b/include/linux/security.h index 5f7441abbf42..46b5af6de59e 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -382,6 +382,7 @@ int security_getprocattr(struct task_struct *p, const char *lsm, char *name, char **value); int security_setprocattr(const char *lsm, const char *name, void *value, size_t size); +int security_netlink_receive(struct sock *sk, struct sk_buff *skb); int security_netlink_send(struct sock *sk, struct sk_buff *skb); int security_ismaclabel(const char *name); int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen); @@ -1162,6 +1163,11 @@ static inline int security_setprocattr(const char *lsm, char *name, return -EINVAL; } +static inline int security_netlink_receive(struct sock *sk, struct sk_buff *skb) +{ + return 0; +} + static inline int security_netlink_send(struct sock *sk, struct sk_buff *skb) { return 0; diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 1ee6460f8275..7d69fcb8d22e 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1650,8 +1650,16 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, goto nla_put_failure; if (dev->addr_len) { - if (nla_put(skb, IFLA_ADDRESS, dev->addr_len, dev->dev_addr) || - nla_put(skb, IFLA_BROADCAST, dev->addr_len, dev->broadcast)) + if (skb->sk && security_netlink_receive(skb->sk, skb)) { + if (!nla_reserve(skb, IFLA_ADDRESS, dev->addr_len)) + goto nla_put_failure; + + } else { + if (nla_put(skb, IFLA_ADDRESS, dev->addr_len, + dev->dev_addr)) + goto nla_put_failure; + } + if (nla_put(skb, IFLA_BROADCAST, dev->addr_len, dev->broadcast)) goto nla_put_failure; } diff --git a/security/security.c b/security/security.c index 250ee2d76406..35c5929921b2 100644 --- a/security/security.c +++ b/security/security.c @@ -1861,6 +1861,11 @@ int security_setprocattr(const char *lsm, const char *name, void *value, return -EINVAL; } +int security_netlink_receive(struct sock *sk, struct sk_buff *skb) +{ + return call_int_hook(netlink_receive, 0, sk, skb); +} + int security_netlink_send(struct sock *sk, struct sk_buff *skb) { return call_int_hook(netlink_send, 0, sk, skb); From patchwork Wed Aug 21 13:46:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffrey Vander Stoep X-Patchwork-Id: 11106797 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 04E4E13B1 for ; Wed, 21 Aug 2019 13:46:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D5D49233A0 for ; Wed, 21 Aug 2019 13:46:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="QLSNKFK2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728673AbfHUNqW (ORCPT ); Wed, 21 Aug 2019 09:46:22 -0400 Received: from mail-qk1-f201.google.com ([209.85.222.201]:55645 "EHLO mail-qk1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728616AbfHUNqV (ORCPT ); Wed, 21 Aug 2019 09:46:21 -0400 Received: by mail-qk1-f201.google.com with SMTP id m198so2127841qke.22 for ; Wed, 21 Aug 2019 06:46:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=rxOZiHLiXlR7oWwCjeqqkt/Tx6NEkM2JG/wKnc0+cI0=; b=QLSNKFK2BljYAlq+6cET1vNhCXir5M2toI8tLBH7koa2ZkMCQ/40X6Ysig01A8gd4x Uv+KJDMWXs5767ljAKpUxAGOOkW90VkO43TZCQdGTC07PkZ7x074B8qCz4t11rPbceOj qFesrjdLZNYMZJp6g6hS6QSnXYNU+LWM7jH2B//Lw8NHPE7LNUURKT9/gOqCV0wO6UVW S+qnDv2FmGQUm81aitsgD9Jmr3TiiB9Me2m24TC5zV9nJsep/LiWlyL1XtiWd+2b0NGC ai4wNEkw3glv4SBB2Ym1QUfqars9mtAT41Gi/rm4ggGz8VaFxhqY9f5jZe7VkyUCICBB jBqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=rxOZiHLiXlR7oWwCjeqqkt/Tx6NEkM2JG/wKnc0+cI0=; b=Py8gVFbNNGU4maQnjyxmNMGK1JyH6Zjs5QC7sX+5IT4Z2ghoVhl+nTsFiz5OmqZxRE /oiy3W9r+JgAC2xM4MYWn0IJ5cPvCnjxtsDoLTvfGekuiCL6pKuAAEmxLh9DHl0jDZSR HVbJ9k92MCPTvxr4OIDrnbVP44uQZOTJbY4Z1ET4ap+eFCKt2wrBu4Ijq9DRnrlptjxX bKgvGmJguYst43nd1osWPaUuqHw88v28Aw7sMfefYRv2oESfeaiDPhV5LrOQKQhjUDgu Nq7G+AM1wt3Ih2Xp+RKhm579CPMESvnTMwQ0JPFJ29f3/jtGFjCCul7/cB5A8OEDPnM/ suFQ== X-Gm-Message-State: APjAAAXY3vvNlqptSwtgNHua4Nk+E2k8HI+IHR+LUp8twQONG/LCzwvu MDlTSB50flH6xo2Dr12S1wNEejkvCQ== X-Google-Smtp-Source: APXvYqxf61t+iGOt/jCj9FILC8WV2Oy4AeBZmfAatOmH8J1ocxdsbu6srUgHfqOWhuWwGvAOkp9pPRRB0g== X-Received: by 2002:ac8:41d1:: with SMTP id o17mr31262970qtm.383.1566395180609; Wed, 21 Aug 2019 06:46:20 -0700 (PDT) Date: Wed, 21 Aug 2019 15:46:16 +0200 Message-Id: <20190821134616.97894-1-jeffv@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog Subject: [PATCH 2/2] selinux: use netlink_receive hook From: Jeff Vander Stoep To: netdev@vger.kernel.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Cc: Jeff Vander Stoep Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: Add the nlmsg_readpriv permission to netlink_route socket class. Currently this is only used to restrict MAC address access. Signed-off-by: Jeff Vander Stoep --- security/selinux/hooks.c | 6 ++++++ security/selinux/include/classmap.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 74dd46de01b6..2ab89a73f663 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -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), diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h index 201f7e588a29..3726c61a3dd1 100644 --- a/security/selinux/include/classmap.h +++ b/security/selinux/include/classmap.h @@ -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 } },