From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 277ABC10F0E for ; Tue, 9 Apr 2019 20:00:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E63EE2084B for ; Tue, 9 Apr 2019 20:00:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=yahoo.com header.i=@yahoo.com header.b="p84X7gF6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726515AbfDIUAY (ORCPT ); Tue, 9 Apr 2019 16:00:24 -0400 Received: from sonic301-38.consmr.mail.ne1.yahoo.com ([66.163.184.207]:39874 "EHLO sonic301-38.consmr.mail.ne1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726714AbfDIUAH (ORCPT ); Tue, 9 Apr 2019 16:00:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1554840005; bh=wTEQTvklkThW7Dll4nUn/vb0sTDbloo0pZigu96CHzg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject; b=p84X7gF6s17rAEUE+LbXADY7mUesryw2t1dDZz+cn9flrwL9K1CuruAAXbEJow4LbTIkIXhXhUJeLK390xHrHirFqwcC0AyfvCgEr5vmTChevz68jJapmN1aVCB9CD8jZZek9RP8Ovo0Xq+ZqhZRI6NNXljweMBP95OmHALL3GHIZclgHS0KVWr6tVmZQ0hBxecpusysjHJanrKLOW84l68T9RhfgqsT6DxTpJy02/P9g85aNZDQloTMNTN8Ikb3pBap9jkOFwkIrMoKf/nxPD7aE/pGfgNKFYchZGEIqBymnP20PeS4k7i3vD5pcma/+rblhHToXQHfMdPnbs6eFA== X-YMail-OSG: caJzwyIVM1lN2AZrSxryjU_zI89D.U2DqlO8wqjW.TeWgKF4jYCmrjGdt6G.Vyx QNa9oLyC2KB82HChBR6mJDAhLzOggmns1GxQ764lPwQmYFcSRXCVvzifQOFwbk7ucbeFbDdpGfvv iJ0XGIldqDprCBl5TV60lFni_j_5q7XptIkajIeSqByhNhSdgF9ouDt_Mh3sob3VKHWQkaG5_llS lb51VSUu3nXqBLTTp6hUF__hpipAMqYknBW9CXcYslRg30KRM3RKCMBl6BeLtFp_ZWq_S89Ww4Bj j6NOzo4FARsdHakpwSGYWIXk_zpbGeUQNcZ1yZlwdtepksC8ArrQEtKFPSx4vzDazEkD6Y_9MmLo Cv.H4RJjMCXTc4v.PtFH0y7R7hRp.g5rWHayij8Z1Z3bM17Snx6NjfDx2Rv0y4PLUMdyFjv8FPS2 t0L.iNaNFsl4CB7xHhJ1IyS9p_7rp3usoRBppTAw193YL4odvcjnXccjoLegrK28pAU5mhlGdybb 3mO1CsH0Gka.Ko.FhaW2HLLNFAhI3xwpzfiDWFcO_l9rIeJCkPm74bqO_iGAtfcWP1cAt_9354bo 0Hs4EYptLRQ7TnUMZIRva5ycWMhpWYkdfT2Es2SYtZPQLdjIxqtKQtRy9bd0tHzTeXiqMKZHz71C fVwj3KvKakgEhG.LkK7oz.R.Oi3M0k5dzx9MYjNT7SxkGbcpqdcRaCcgqYGr9Oo0aiQRT2hV30k9 ztawP6sgXmctMdNO6Yr2dPYXoJ.kRo4Ges8z_3Z77b92E1nO_GkzXQ2aOCHa4gSYSzs3jinhe2Bx bLhL3J7U36nO02velNxixccWrUnJ_eybI3dML.wIwl3yKMeDPKSc5e6cCwVQL0JCYt5NGZx56LfX IeO7IxoisQ496Wr0wwEf9xaUkvDpS7Y7AfzrJy_c.hqIemi6UIRHs7x5oRKpxWG._7xWKStQjDju 4NtHprwa.oLKK96lKqA3i3OZaMZ1FhYObQZUfc9UyXSYTjaBLl2ecM7WSIosB2VrD2SnptNEo4D0 a060irtxjknd_2nM3Z3nk20kEpBSD68TsBrc2bpaRWDX9sV0I5tdMJCynKXQ.epMKLKzmWTxZ0Ki oM.F6RRWnLkIfibs9QnJtsyfn4BrQwEpPPRnpbmhhczQaUTdH.ya.TVO1TmE4 Received: from sonic.gate.mail.ne1.yahoo.com by sonic301.consmr.mail.ne1.yahoo.com with HTTP; Tue, 9 Apr 2019 20:00:05 +0000 Received: from c-67-169-65-224.hsd1.ca.comcast.net (EHLO localhost.localdomain) ([67.169.65.224]) by smtp401.mail.bf1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 24fceb1ba198cd68afe9603a17bf6fc8; Tue, 09 Apr 2019 20:00:04 +0000 (UTC) From: Casey Schaufler To: casey.schaufler@intel.com, jmorris@namei.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Cc: casey@schaufler-ca.com, keescook@chromium.org, john.johansen@canonical.com, penguin-kernel@i-love.sakura.ne.jp, paul@paul-moore.com, sds@tycho.nsa.gov Subject: [PATCH 16/59] LSM: Use lsm_export in security_socket_getpeersec_dgram Date: Tue, 9 Apr 2019 12:58:41 -0700 Message-Id: <20190409195924.1509-17-casey@schaufler-ca.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190409195924.1509-1-casey@schaufler-ca.com> References: <20190409195924.1509-1-casey@schaufler-ca.com> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: Convert security_socket_getpeersec_dgram to use the lsm_export structure instead of a u32 secid. There is some scaffolding involved that will be removed when the related data is updated. In particular, the le entry in scm_cookie includes the secid data. The secid will go away. Signed-off-by: Casey Schaufler --- include/linux/security.h | 7 +++++-- include/net/scm.h | 4 +++- net/ipv4/ip_sockglue.c | 4 +++- security/security.c | 13 ++++--------- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/include/linux/security.h b/include/linux/security.h index 7369cdc3a681..e3f5c61b9b2c 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -1270,7 +1270,8 @@ int security_socket_shutdown(struct socket *sock, int how); int security_sock_rcv_skb(struct sock *sk, struct sk_buff *skb); int security_socket_getpeersec_stream(struct socket *sock, char __user *optval, int __user *optlen, unsigned len); -int security_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb, u32 *secid); +int security_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb, + struct lsm_export *l); int security_sk_alloc(struct sock *sk, int family, gfp_t priority); void security_sk_free(struct sock *sk); void security_sk_clone(const struct sock *sk, struct sock *newsk); @@ -1408,7 +1409,9 @@ static inline int security_socket_getpeersec_stream(struct socket *sock, char __ return -ENOPROTOOPT; } -static inline int security_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb, u32 *secid) +static inline int security_socket_getpeersec_dgram(struct socket *sock, + struct sk_buff *skb, + struct lsm_export *l) { return -ENOPROTOOPT; } diff --git a/include/net/scm.h b/include/net/scm.h index 1ce365f4c256..13b8a369fd89 100644 --- a/include/net/scm.h +++ b/include/net/scm.h @@ -34,6 +34,7 @@ struct scm_cookie { struct scm_creds creds; /* Skb credentials */ #ifdef CONFIG_SECURITY_NETWORK u32 secid; /* Passed security ID */ + struct lsm_export le; /* Passed LSM data */ #endif }; @@ -46,7 +47,8 @@ struct scm_fp_list *scm_fp_dup(struct scm_fp_list *fpl); #ifdef CONFIG_SECURITY_NETWORK static __inline__ void unix_get_peersec_dgram(struct socket *sock, struct scm_cookie *scm) { - security_socket_getpeersec_dgram(sock, NULL, &scm->secid); + security_socket_getpeersec_dgram(sock, NULL, &scm->le); + lsm_export_secid(&scm->le, &scm->secid); } #else static __inline__ void unix_get_peersec_dgram(struct socket *sock, struct scm_cookie *scm) diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 82f341e84fae..b8ef7677a7e5 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -130,14 +130,16 @@ static void ip_cmsg_recv_checksum(struct msghdr *msg, struct sk_buff *skb, static void ip_cmsg_recv_security(struct msghdr *msg, struct sk_buff *skb) { + struct lsm_export le; char *secdata; u32 seclen, secid; int err; - err = security_socket_getpeersec_dgram(NULL, skb, &secid); + err = security_socket_getpeersec_dgram(NULL, skb, &le); if (err) return; + lsm_export_secid(&le, &secid); err = security_secid_to_secctx(secid, &secdata, &seclen); if (err) return; diff --git a/security/security.c b/security/security.c index edaaaef54239..d8300a6400c3 100644 --- a/security/security.c +++ b/security/security.c @@ -2110,16 +2110,11 @@ int security_socket_getpeersec_stream(struct socket *sock, char __user *optval, } int security_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb, - u32 *secid) + struct lsm_export *l) { - int rc; - struct lsm_export data = { .flags = LSM_EXPORT_NONE }; - - rc = call_int_hook(socket_getpeersec_dgram, -ENOPROTOOPT, sock, skb, - &data); - - lsm_export_secid(&data, secid); - return rc; + lsm_export_init(l); + return call_int_hook(socket_getpeersec_dgram, -ENOPROTOOPT, sock, skb, + l); } EXPORT_SYMBOL(security_socket_getpeersec_dgram); -- 2.19.1