From: Casey Schaufler <casey@schaufler-ca.com>
To: Paul Moore <paul@paul-moore.com>
Cc: casey.schaufler@intel.com, James Morris <jmorris@namei.org>,
linux-security-module@vger.kernel.org, selinux@vger.kernel.org,
keescook@chromium.org, john.johansen@canonical.com,
penguin-kernel@i-love.sakura.ne.jp,
Stephen Smalley <sds@tycho.nsa.gov>
Subject: Re: [PATCH v15 06/23] Use lsmblob in security_secctx_to_secid
Date: Mon, 9 Mar 2020 18:13:58 -0700 [thread overview]
Message-ID: <9d3334a9-d1c2-8acf-9970-76efd578db36@schaufler-ca.com> (raw)
In-Reply-To: <CAHC9VhQyXEhU+2+Js+7B2AuebnD2ZQDT+5bHU-gO4FshvcFzGQ@mail.gmail.com>
On 3/6/2020 4:58 PM, Paul Moore wrote:
> On Fri, Feb 14, 2020 at 6:43 PM Casey Schaufler <casey@schaufler-ca.com> wrote:
>> Change security_secctx_to_secid() to fill in a lsmblob instead
>> of a u32 secid. Multiple LSMs may be able to interpret the
>> string, and this allows for setting whichever secid is
>> appropriate. In some cases there is scaffolding where other
>> interfaces have yet to be converted.
>>
>> 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>
>> ---
>> include/linux/security.h | 5 +++--
>> kernel/cred.c | 4 +---
>> net/netfilter/nft_meta.c | 12 +++++++-----
>> net/netfilter/xt_SECMARK.c | 5 ++++-
>> net/netlabel/netlabel_unlabeled.c | 14 ++++++++------
>> security/security.c | 18 +++++++++++++++---
>> 6 files changed, 38 insertions(+), 20 deletions(-)
> ...
>
>> diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c
>> index 951b6e87ed5d..e12125b85035 100644
>> --- a/net/netfilter/nft_meta.c
>> +++ b/net/netfilter/nft_meta.c
>> @@ -811,21 +811,23 @@ static const struct nla_policy nft_secmark_policy[NFTA_SECMARK_MAX + 1] = {
>>
>> static int nft_secmark_compute_secid(struct nft_secmark *priv)
>> {
>> - u32 tmp_secid = 0;
>> + struct lsmblob blob;
>> int err;
>>
>> - err = security_secctx_to_secid(priv->ctx, strlen(priv->ctx), &tmp_secid);
>> + err = security_secctx_to_secid(priv->ctx, strlen(priv->ctx), &blob);
>> if (err)
>> return err;
>>
>> - if (!tmp_secid)
>> + if (!lsmblob_is_set(&blob))
>> return -ENOENT;
>>
>> - err = security_secmark_relabel_packet(tmp_secid);
>> + /* Using le[0] is scaffolding */
>> + err = security_secmark_relabel_packet(blob.secid[0]);
>> if (err)
>> return err;
> At the very least it looks like the comment above needs an update.
I can see that.
> However, I would really like to see an explanation in this patch,
> either in the comments or in the commit description, about how you
> plan to handle secmarks.
Yes. It should probably be spread between here, 0017 and the introduction.
> If your plan is to always have it be the
> first LSM, let's admit that and document it appropriately. If there
> is something much grander coming later in the patchset I guess
> "scaffolding" is an okay term, but it would be good to mention in the
> commit description that this will be replaced with something better
> later in the patchset.
You are correct.
> I'm worried about the case five years from know when we are changing
> this code, either due to bugs or new features, and we stumble across
> this commit. Was it always intended to be this way? Or was this
> temporary? Right now I don't know.
>
>> - priv->secid = tmp_secid;
>> + /* Using le[0] is scaffolding */
>> + priv->secid = blob.secid[0];
>> return 0;
>> }
> ...
>
>> diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
>> index d2e4ab8d1cb1..7a5a87f15736 100644
>> --- a/net/netlabel/netlabel_unlabeled.c
>> +++ b/net/netlabel/netlabel_unlabeled.c
>> @@ -881,7 +881,7 @@ static int netlbl_unlabel_staticadd(struct sk_buff *skb,
>> void *addr;
>> void *mask;
>> u32 addr_len;
>> - u32 secid;
>> + struct lsmblob blob;
>> struct netlbl_audit audit_info;
>>
>> /* Don't allow users to add both IPv4 and IPv6 addresses for a
>> @@ -905,12 +905,13 @@ static int netlbl_unlabel_staticadd(struct sk_buff *skb,
>> ret_val = security_secctx_to_secid(
>> nla_data(info->attrs[NLBL_UNLABEL_A_SECCTX]),
>> nla_len(info->attrs[NLBL_UNLABEL_A_SECCTX]),
>> - &secid);
>> + &blob);
>> if (ret_val != 0)
>> return ret_val;
>>
>> + /* scaffolding with the [0] */
>> return netlbl_unlhsh_add(&init_net,
>> - dev_name, addr, mask, addr_len, secid,
>> + dev_name, addr, mask, addr_len, blob.secid[0],
>> &audit_info);
>> }
> Same as above, although this time with the peer label.
>
next prev parent reply other threads:[~2020-03-10 1:14 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200214234203.7086-1-casey.ref@schaufler-ca.com>
2020-02-14 23:41 ` [PATCH v15 00/23] LSM: Module stacking for AppArmor Casey Schaufler
2020-02-14 23:41 ` [PATCH v15 01/23] LSM: Infrastructure management of the sock security Casey Schaufler
2020-03-06 20:37 ` Paul Moore
2020-02-14 23:41 ` [PATCH v15 02/23] LSM: Create and manage the lsmblob data structure Casey Schaufler
2020-02-18 17:56 ` Stephen Smalley
2020-02-24 17:56 ` Mimi Zohar
2020-02-14 23:41 ` [PATCH v15 03/23] LSM: Use lsmblob in security_audit_rule_match Casey Schaufler
2020-02-24 18:26 ` Mimi Zohar
2020-02-14 23:41 ` [PATCH v15 04/23] LSM: Use lsmblob in security_kernel_act_as Casey Schaufler
2020-03-06 22:06 ` Paul Moore
2020-02-14 23:41 ` [PATCH v15 05/23] net: Prepare UDS for security module stacking Casey Schaufler
2020-03-06 22:14 ` Paul Moore
2020-03-10 0:13 ` Casey Schaufler
2020-03-10 1:02 ` Paul Moore
2020-02-14 23:41 ` [PATCH v15 06/23] Use lsmblob in security_secctx_to_secid Casey Schaufler
2020-03-07 0:58 ` Paul Moore
2020-03-10 1:13 ` Casey Schaufler [this message]
2020-02-14 23:41 ` [PATCH v15 07/23] LSM: Use lsmblob in security_secid_to_secctx Casey Schaufler
2020-02-14 23:41 ` [PATCH v15 08/23] LSM: Use lsmblob in security_ipc_getsecid Casey Schaufler
2020-02-14 23:41 ` [PATCH v15 09/23] LSM: Use lsmblob in security_task_getsecid Casey Schaufler
2020-02-14 23:41 ` [PATCH v15 10/23] LSM: Use lsmblob in security_inode_getsecid Casey Schaufler
2020-02-14 23:41 ` [PATCH v15 11/23] LSM: Use lsmblob in security_cred_getsecid Casey Schaufler
2020-02-14 23:41 ` [PATCH v15 12/23] IMA: Change internal interfaces to use lsmblobs Casey Schaufler
2020-02-14 23:41 ` [PATCH v15 13/23] LSM: Specify which LSM to display Casey Schaufler
2020-03-07 1:49 ` Paul Moore
2020-02-14 23:41 ` [PATCH v15 14/23] LSM: Ensure the correct LSM context releaser Casey Schaufler
2020-02-14 23:41 ` [PATCH v15 15/23] LSM: Use lsmcontext in security_secid_to_secctx Casey Schaufler
2020-02-14 23:41 ` [PATCH v15 16/23] LSM: Use lsmcontext in security_inode_getsecctx Casey Schaufler
2020-02-14 23:41 ` [PATCH v15 17/23] LSM: security_secid_to_secctx in netlink netfilter Casey Schaufler
2020-03-07 2:06 ` Paul Moore
2020-02-14 23:41 ` [PATCH v15 18/23] NET: Store LSM netlabel data in a lsmblob Casey Schaufler
2020-03-07 2:14 ` Paul Moore
2020-03-10 1:21 ` Casey Schaufler
2020-02-14 23:41 ` [PATCH v15 19/23] LSM: Verify LSM display sanity in binder Casey Schaufler
2020-02-14 23:42 ` [PATCH v15 20/23] Audit: Add subj_LSM fields when necessary Casey Schaufler
2020-02-14 23:42 ` [PATCH v15 21/23] Audit: Include object data for all security modules Casey Schaufler
2020-02-14 23:42 ` [PATCH v15 22/23] LSM: Add /proc attr entry for full LSM context Casey Schaufler
2020-02-18 18:17 ` Stephen Smalley
2020-02-14 23:42 ` [PATCH v15 23/23] AppArmor: Remove the exclusive flag Casey Schaufler
2020-02-18 18:19 ` Stephen Smalley
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=9d3334a9-d1c2-8acf-9970-76efd578db36@schaufler-ca.com \
--to=casey@schaufler-ca.com \
--cc=casey.schaufler@intel.com \
--cc=jmorris@namei.org \
--cc=john.johansen@canonical.com \
--cc=keescook@chromium.org \
--cc=linux-security-module@vger.kernel.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).