From: James Morris <jmorris@namei.org>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Casey Schaufler <casey@schaufler-ca.com>,
casey.schaufler@intel.com, linux-security-module@vger.kernel.org,
selinux@vger.kernel.org, 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, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, netfilter-devel@vger.kernel.org
Subject: Re: [PATCH v22 16/23] LSM: security_secid_to_secctx in netlink netfilter
Date: Wed, 11 Nov 2020 06:26:12 +1100 (AEDT) [thread overview]
Message-ID: <alpine.LRH.2.21.2011110626050.32313@namei.org> (raw)
In-Reply-To: <20201110133715.GA1890@salvia>
On Tue, 10 Nov 2020, Pablo Neira Ayuso wrote:
> Hi Casey,
>
> On Wed, Nov 04, 2020 at 04:49:17PM -0800, Casey Schaufler wrote:
> > Change netlink netfilter interfaces to use lsmcontext
> > pointers, and remove scaffolding.
> >
> > Reviewed-by: Kees Cook <keescook@chromium.org>
> > Reviewed-by: John Johansen <john.johansen@canonical.com>
> > Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
> > Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
> > Cc: netdev@vger.kernel.org
> > Cc: netfilter-devel@vger.kernel.org
>
> You can carry this tag in your follow up patches.
>
> Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Thanks for the review!
>
> Thanks.
>
> > ---
> > net/netfilter/nfnetlink_queue.c | 37 +++++++++++++--------------------
> > 1 file changed, 14 insertions(+), 23 deletions(-)
> >
> > diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
> > index 84be5a49a157..0d8b83d84422 100644
> > --- a/net/netfilter/nfnetlink_queue.c
> > +++ b/net/netfilter/nfnetlink_queue.c
> > @@ -301,15 +301,13 @@ 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 void 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;
> > + return;
> >
> > read_lock_bh(&skb->sk->sk_callback_lock);
> >
> > @@ -318,14 +316,12 @@ 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;
> > #endif
> > - return seclen;
> > + return;
> > }
> >
> > static u32 nfqnl_get_bridge_size(struct nf_queue_entry *entry)
> > @@ -398,12 +394,10 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
> > struct net_device *indev;
> > struct net_device *outdev;
> > struct nf_conn *ct = NULL;
> > + struct lsmcontext context = { };
> > enum ip_conntrack_info ctinfo;
> > struct nfnl_ct_hook *nfnl_ct;
> > bool csum_verify;
> > - struct lsmcontext scaff; /* scaffolding */
> > - char *secdata = NULL;
> > - u32 seclen = 0;
> >
> > size = nlmsg_total_size(sizeof(struct nfgenmsg))
> > + nla_total_size(sizeof(struct nfqnl_msg_packet_hdr))
> > @@ -469,9 +463,9 @@ 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);
> > - if (seclen)
> > - size += nla_total_size(seclen);
> > + nfqnl_get_sk_secctx(entskb, &context);
> > + if (context.len)
> > + size += nla_total_size(context.len);
> > }
> >
> > skb = alloc_skb(size, GFP_ATOMIC);
> > @@ -604,7 +598,8 @@ 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 (context.len &&
> > + 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 +627,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 (context.len)
> > + security_release_secctx(&context);
> > return skb;
> >
> > nla_put_failure:
> > @@ -643,10 +636,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 (context.len)
> > + security_release_secctx(&context);
> > return NULL;
> > }
> >
> > --
> > 2.24.1
> >
>
--
James Morris
<jmorris@namei.org>
next prev parent reply other threads:[~2020-11-10 19:26 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20201105004924.11651-1-casey.ref@schaufler-ca.com>
2020-11-05 0:49 ` [PATCH v22 00/23] LSM: Module stacking for AppArmor Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 01/23] LSM: Infrastructure management of the sock security Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 02/23] LSM: Create and manage the lsmblob data structure Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 03/23] LSM: Use lsmblob in security_audit_rule_match Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 04/23] LSM: Use lsmblob in security_kernel_act_as Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 05/23] LSM: Use lsmblob in security_secctx_to_secid Casey Schaufler
2020-11-10 6:53 ` James Morris
2020-11-05 0:49 ` [PATCH v22 06/23] LSM: Use lsmblob in security_secid_to_secctx Casey Schaufler
2020-11-10 6:56 ` James Morris
2020-11-05 0:49 ` [PATCH v22 07/23] LSM: Use lsmblob in security_ipc_getsecid Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 08/23] LSM: Use lsmblob in security_task_getsecid Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 09/23] LSM: Use lsmblob in security_inode_getsecid Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 10/23] LSM: Use lsmblob in security_cred_getsecid Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 11/23] IMA: Change internal interfaces to use lsmblobs Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 12/23] LSM: Specify which LSM to display Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 13/23] LSM: Ensure the correct LSM context releaser Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 14/23] LSM: Use lsmcontext in security_secid_to_secctx Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 15/23] LSM: Use lsmcontext in security_inode_getsecctx Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 16/23] LSM: security_secid_to_secctx in netlink netfilter Casey Schaufler
2020-11-10 13:37 ` Pablo Neira Ayuso
2020-11-10 19:26 ` James Morris [this message]
2020-11-05 0:49 ` [PATCH v22 17/23] NET: Store LSM netlabel data in a lsmblob Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 18/23] LSM: Verify LSM display sanity in binder Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 19/23] audit: add support for non-syscall auxiliary records Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 20/23] Audit: Add new record for multiple process LSM attributes Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 21/23] Audit: Add a new record for multiple object " Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 22/23] LSM: Add /proc attr entry for full LSM context Casey Schaufler
2020-11-05 0:49 ` [PATCH v22 23/23] AppArmor: Remove the exclusive flag Casey Schaufler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LRH.2.21.2011110626050.32313@namei.org \
--to=jmorris@namei.org \
--cc=casey.schaufler@intel.com \
--cc=casey@schaufler-ca.com \
--cc=john.johansen@canonical.com \
--cc=keescook@chromium.org \
--cc=linux-audit@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=paul@paul-moore.com \
--cc=penguin-kernel@i-love.sakura.ne.jp \
--cc=sds@tycho.nsa.gov \
--cc=selinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).