From patchwork Wed Aug 26 14:52:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Schaufler X-Patchwork-Id: 11739009 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 C9C221731 for ; Wed, 26 Aug 2020 15:20:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ABF722078D for ; Wed, 26 Aug 2020 15:20:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=yahoo.com header.i=@yahoo.com header.b="RgcM/Azl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728049AbgHZPUT (ORCPT ); Wed, 26 Aug 2020 11:20:19 -0400 Received: from sonic312-29.consmr.mail.ne1.yahoo.com ([66.163.191.210]:36820 "EHLO sonic312-29.consmr.mail.ne1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727977AbgHZPUP (ORCPT ); Wed, 26 Aug 2020 11:20:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1598455215; bh=qd7sr8JC2sP3QmLhn76nKiaVYv/GIrllEFl1X7JnYN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject; b=RgcM/AzlFDLDuxtNrQ2V8vN//bNiyOo9dzHver6pjmHosJXlFfhXrk8OE3r9mvhyb3DRiDRAwoc3K8kM0eVKcgR0ta2L3yixL9NGial3jUcJr8d2Ur3d0eskElsQd/QTQ2nGQVmUhEAuL/t4kBZeLPW/IJjuurVacoRuHjo1FaITnZYvX1vVeq4YesKnFs77cFQ623hvh5Hb5tjeSciZX4LeRsubtsAeOvIKxueFg/eIMTPt0BRwI74cILvGWc5IHpgcdUbsveWAJYhUeF5oNdKEiCtSWghLao0IbygbqAO5J8xHzNzrQipCyvmrY2Rh3fsijc3iNh1f+JlcLtC+xw== X-YMail-OSG: GajDSr0VM1kZ0OF65FN7B17KCqyzINJ4OFknWUfu5MG0eIPIrtueVQn902HZfWX QRJ_USigcC0QuaOB4.9_.OGgrqfJv4aRa1FT86JHEhSiY48fnL19KkrQBXJ.ablryAisaL6Qx2w3 vRU8MeZhJLQyjGGlSW994kMY0LZRhnPFn71Ov1yTu06w8I__DCTRphlSRUnwHSVod_h.0WrGaU5u eonjvKl.yAtO_uF8lAmKRTTU3HN4dwJ6ZsHV7gapLUiRGmy0FsG3T5p4CkdgZHxE.MaxelwFxp4P lvbYfQstls_rOTY4SnSgwy92mPRAYRjKVv5jNwHuIxAoJoSXLXkKPBHm.CKLK1IcVrZzHsWi_F9K NpP4qFP70mqNP5dU_I_dTIokfBQzoHck7sergVs26m23rV2p9T.WbNbyafhjTJ697ZIHtWt.F4ec cGE5VYk9zncd6g1sSMpPzp_J54VSmZ0Wxpny9GGLdPyw0t18fin2k7DMoDBE.IEe83iEEgDvQ3wS ZQfiGkuBsKf4_J6IK850pLIzCeUmaJ24_cEcY8IL.ksmGfBQpjbwV8KdoQvK_LHHI7OYo6X.PKoj 3tRerT31Av87tkyz3pctiJZDFLfvF.2Qy529wWldcYtAcDhf0TfhSm1d4cya7SEZF3u15e_ZmgCj HnChLUAZOrLX3ymj5yfnNhyiBeutn4kkfz7i20RpWFT1ucnqG5nOh2.vWQvH6LMFieudhH5hsCfb D8cl1SGI7A5e_z9YjGWQ5mHzMW8g7VLkVhGqeUnjR.v1sQaM22l6b4Xg.nWiS_WG5GliKd7ChrxH BvBMen2Ycn3mDI4g6_pvJg0ES4jFDxlvf0LnVeKBLB7Si3UPI1dsA3fnG_eJdAWwtp2xpjgHieu6 DzonPG6js62LKd11XQ9K_Vonx7kM3f9D8yTB3NzeeG1osuArrDc.FPpXrPQjWu4bD0nBDSriRiUD L02FBXsArNpAthGswV45whvqzlzf6puDrrPDTnZ0OtimLbLbKggG7dUu02K2iuTDope0r2YQiOTX IKS32z9CKV1ShI3m.n2TnViSlnSt.ev5trThFlsS9wfa5R9ye0TLZcwYDc6X.vImWbozGFGxPUBI HozLij9rR1v1d44M9zjJ8j2uiiY9S9jdzLUePFSm3pQ.1e3vSmm8_hXqHO_G34G5vQKAaTNFRUtC 09q7pv_fUu6QMJJBVH8.dyoKuSACg_Ryy.RspCTdYELyJ5hobPg1gfWntvAp.b6P00TIuLhuBRBd le2snXTA1tuVemSS_7Vd91UnzwOUU4gikilFOuPmaVjg4u3qUFtltMKfWENka0ynvpcM1XAwezeC In.1iyx0MqFALt.h3xTrq5qkrN8kCyaZJKmMYfYWi72YhG9lYPdB5m_4HAd3x3mARlkA4Nvo0IT3 2mw7FYDZ7Idd6wWJmBa9ixVGd8.gUIGbPgq0bO_OaFopCrX8JUTE7IP4fNUeRjS28__P7ipxW9WI 5Al07fX7kue2HJr9i3oF6WyVfYhQTLIk6xqnNQUn0R0vjn0y2aAbcK3nyOC7d.j3Fx_RbNwZzRtg hHqNDw21IUPFKb_EIBawr2kr_V08SkA-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic312.consmr.mail.ne1.yahoo.com with HTTP; Wed, 26 Aug 2020 15:20:15 +0000 Received: by smtp420.mail.bf1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 12a1ede8fa09b544263df0bf06dc9521; Wed, 26 Aug 2020 15:20:12 +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, linux-audit@redhat.com, keescook@chromium.org, john.johansen@canonical.com, penguin-kernel@i-love.sakura.ne.jp, paul@paul-moore.com, sds@tycho.nsa.gov, netdev@vger.kernel.org Subject: [PATCH v20 17/23] LSM: security_secid_to_secctx in netlink netfilter Date: Wed, 26 Aug 2020 07:52:41 -0700 Message-Id: <20200826145247.10029-18-casey@schaufler-ca.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200826145247.10029-1-casey@schaufler-ca.com> References: <20200826145247.10029-1-casey@schaufler-ca.com> MIME-Version: 1.0 Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: Change netlink netfilter interfaces to use lsmcontext pointers, and remove scaffolding. Reviewed-by: Kees Cook Reviewed-by: John Johansen Acked-by: Stephen Smalley Signed-off-by: Casey Schaufler cc: netdev@vger.kernel.org --- net/netfilter/nfnetlink_queue.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index d3f8e808c5d3..c830401f7792 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -301,12 +301,10 @@ static int nfqnl_put_sk_uidgid(struct sk_buff *skb, struct sock *sk) return -1; } -static u32 nfqnl_get_sk_secctx(struct sk_buff *skb, char **secdata) +static u32 nfqnl_get_sk_secctx(struct sk_buff *skb, struct lsmcontext *context) { - u32 seclen = 0; #if IS_ENABLED(CONFIG_NETWORK_SECMARK) struct lsmblob blob; - struct lsmcontext context = { }; if (!skb || !sk_fullsock(skb->sk)) return 0; @@ -318,14 +316,14 @@ static u32 nfqnl_get_sk_secctx(struct sk_buff *skb, char **secdata) * blob. security_secid_to_secctx() will know which security * module to use to create the secctx. */ lsmblob_init(&blob, skb->secmark); - security_secid_to_secctx(&blob, &context); - *secdata = context.context; + security_secid_to_secctx(&blob, context); } read_unlock_bh(&skb->sk->sk_callback_lock); - seclen = context.len; + return context->len; +#else + return 0; #endif - return seclen; } static u32 nfqnl_get_bridge_size(struct nf_queue_entry *entry) @@ -401,8 +399,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, enum ip_conntrack_info ctinfo; struct nfnl_ct_hook *nfnl_ct; bool csum_verify; - struct lsmcontext scaff; /* scaffolding */ - char *secdata = NULL; + struct lsmcontext context = { }; u32 seclen = 0; size = nlmsg_total_size(sizeof(struct nfgenmsg)) @@ -469,7 +466,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, } if ((queue->flags & NFQA_CFG_F_SECCTX) && entskb->sk) { - seclen = nfqnl_get_sk_secctx(entskb, &secdata); + seclen = nfqnl_get_sk_secctx(entskb, &context); if (seclen) size += nla_total_size(seclen); } @@ -604,7 +601,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, nfqnl_put_sk_uidgid(skb, entskb->sk) < 0) goto nla_put_failure; - if (seclen && nla_put(skb, NFQA_SECCTX, seclen, secdata)) + if (seclen && nla_put(skb, NFQA_SECCTX, context.len, context.context)) goto nla_put_failure; if (ct && nfnl_ct->build(skb, ct, ctinfo, NFQA_CT, NFQA_CT_INFO) < 0) @@ -632,10 +629,8 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, } nlh->nlmsg_len = skb->len; - if (seclen) { - lsmcontext_init(&scaff, secdata, seclen, 0); - security_release_secctx(&scaff); - } + if (seclen) + security_release_secctx(&context); return skb; nla_put_failure: @@ -643,10 +638,8 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, kfree_skb(skb); net_err_ratelimited("nf_queue: error creating packet message\n"); nlmsg_failure: - if (seclen) { - lsmcontext_init(&scaff, secdata, seclen, 0); - security_release_secctx(&scaff); - } + if (seclen) + security_release_secctx(&context); return NULL; }