linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Moore <paul@paul-moore.com>
To: Casey Schaufler <casey@schaufler-ca.com>
Cc: casey.schaufler@intel.com, jmorris@namei.org,
	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,
	stephen.smalley.work@gmail.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v36 26/33] Audit: Allow multiple records in an audit_buffer
Date: Fri, 10 Jun 2022 17:04:38 -0400	[thread overview]
Message-ID: <CAHC9VhT-qo=N4k7fWvZNELNLTGDWuE4kDXEOYwMBgZGRQu8f7w@mail.gmail.com> (raw)
In-Reply-To: <20220609230146.319210-27-casey@schaufler-ca.com>

On Thu, Jun 9, 2022 at 7:15 PM Casey Schaufler <casey@schaufler-ca.com> wrote:
>
> Replace the single skb pointer in an audit_buffer with
> a list of skb pointers. Add the audit_stamp information
> to the audit_buffer as there's no guarantee that there
> will be an audit_context containing the stamp associated
> with the event. At audit_log_end() time create auxiliary
> records (none are currently defined) as have been added
> to the list. Functions are created to manage the skb list
> in the audit_buffer.
>
> Suggested-by: Paul Moore <paul@paul-moore.com>
> Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
> ---
>  kernel/audit.c | 113 +++++++++++++++++++++++++++++++++++++++----------
>  1 file changed, 90 insertions(+), 23 deletions(-)

...

> diff --git a/kernel/audit.c b/kernel/audit.c
> index 6b6c089512f7..987740374dfa 100644
> --- a/kernel/audit.c
> +++ b/kernel/audit.c
> @@ -1784,8 +1789,12 @@ static struct audit_buffer *audit_buffer_alloc(struct audit_context *ctx,
>         ab->skb = nlmsg_new(AUDIT_BUFSIZ, gfp_mask);
>         if (!ab->skb)
>                 goto err;
> +
> +       skb_queue_head_init(&ab->skb_list);
> +       skb_queue_tail(&ab->skb_list, ab->skb);
> +
>         if (!nlmsg_put(ab->skb, 0, 0, type, 0, 0))
> -               goto err;
> +               kfree_skb(ab->skb);
>
>         ab->ctx = ctx;
>         ab->gfp_mask = gfp_mask;

I didn't notice this in v35, but if the nlmsg_put() fails I think you
need to preserve the 'goto err;' since the skb hasn't been properly
initialized.  The good news is that I don't think you need to worry
about the 'kfree_skb(ab->skb);' in the error handler as it's already
been placed on the audit_buffer:skb_list list and will be freed when
audit_buffer_alloc()'s error handling code calls audit_buffer_free().

-- 
paul-moore.com

  reply	other threads:[~2022-06-10 21:05 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20220609230146.319210-1-casey.ref@schaufler-ca.com>
2022-06-09 23:01 ` [PATCH v36 00/33] LSM: Module stacking for AppArmor Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 01/33] integrity: disassociate ima_filter_rule from security_audit_rule Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 02/33] LSM: Infrastructure management of the sock security Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 03/33] LSM: Add the lsmblob data structure Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 04/33] LSM: provide lsm name and id slot mappings Casey Schaufler
2022-06-10  7:51     ` kernel test robot
2022-06-09 23:01   ` [PATCH v36 05/33] IMA: avoid label collisions with stacked LSMs Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 06/33] LSM: Use lsmblob in security_audit_rule_match Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 07/33] LSM: Use lsmblob in security_kernel_act_as Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 08/33] LSM: Use lsmblob in security_secctx_to_secid Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 09/33] LSM: Use lsmblob in security_secid_to_secctx Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 10/33] LSM: Use lsmblob in security_ipc_getsecid Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 11/33] LSM: Use lsmblob in security_current_getsecid Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 12/33] LSM: Use lsmblob in security_inode_getsecid Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 13/33] LSM: Use lsmblob in security_cred_getsecid Casey Schaufler
2022-06-12 19:35     ` kernel test robot
2022-06-09 23:01   ` [PATCH v36 14/33] LSM: Specify which LSM to display Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 15/33] LSM: Ensure the correct LSM context releaser Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 16/33] LSM: Use lsmcontext in security_secid_to_secctx Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 17/33] LSM: Use lsmcontext in security_inode_getsecctx Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 18/33] LSM: Use lsmcontext in security_dentry_init_security Casey Schaufler
2022-06-10  3:05     ` kernel test robot
2022-06-23  7:09     ` Dan Carpenter
2022-06-09 23:01   ` [PATCH v36 19/33] LSM: security_secid_to_secctx in netlink netfilter Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 20/33] NET: Store LSM netlabel data in a lsmblob Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 21/33] binder: Pass LSM identifier for confirmation Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 22/33] LSM: Extend security_secid_to_secctx to include module selection Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 23/33] Audit: Keep multiple LSM data in audit_names Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 24/33] Audit: Create audit_stamp structure Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 25/33] LSM: Add a function to report multiple LSMs Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 26/33] Audit: Allow multiple records in an audit_buffer Casey Schaufler
2022-06-10 21:04     ` Paul Moore [this message]
2022-06-09 23:01   ` [PATCH v36 27/33] Audit: Add record for multiple task security contexts Casey Schaufler
2022-06-10 21:06     ` Paul Moore
2022-06-09 23:01   ` [PATCH v36 28/33] audit: multiple subject lsm values for netlabel Casey Schaufler
2022-06-10 21:10     ` Paul Moore
2022-06-09 23:01   ` [PATCH v36 29/33] Audit: Add record for multiple object contexts Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 30/33] netlabel: Use a struct lsmblob in audit data Casey Schaufler
2022-06-10 21:12     ` Paul Moore
2022-06-09 23:01   ` [PATCH v36 31/33] LSM: Removed scaffolding function lsmcontext_init Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 32/33] LSM: Add /proc attr entry for full LSM context Casey Schaufler
2022-06-09 23:01   ` [PATCH v36 33/33] 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='CAHC9VhT-qo=N4k7fWvZNELNLTGDWuE4kDXEOYwMBgZGRQu8f7w@mail.gmail.com' \
    --to=paul@paul-moore.com \
    --cc=casey.schaufler@intel.com \
    --cc=casey@schaufler-ca.com \
    --cc=jmorris@namei.org \
    --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=penguin-kernel@i-love.sakura.ne.jp \
    --cc=selinux@vger.kernel.org \
    --cc=stephen.smalley.work@gmail.com \
    /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).