From: Paul Moore <paul@paul-moore.com> To: Richard Guy Briggs <rgb@redhat.com> Cc: linux-audit@redhat.com, io-uring@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org, Kumar Kartikeya Dwivedi <memxor@gmail.com>, Jens Axboe <axboe@kernel.dk>, Alexander Viro <viro@zeniv.linux.org.uk> Subject: Re: [PATCH 1/2] audit: add filtering for io_uring records, addendum Date: Mon, 7 Jun 2021 19:15:01 -0400 [thread overview] Message-ID: <CAHC9VhRa9dvCfPf5WHKYofrvQrGff7Lh+H4HMAhi_z3nK_rtoA@mail.gmail.com> (raw) In-Reply-To: <3a2903574a4d03f73230047866112b2dad9b4a9e.1622467740.git.rgb@redhat.com> On Mon, May 31, 2021 at 9:45 AM Richard Guy Briggs <rgb@redhat.com> wrote: > > The commit ("audit: add filtering for io_uring records") added support for > filtering io_uring operations. > > Add checks to the audit io_uring filtering code for directory and path watches, > and to keep the list counts consistent. > > Signed-off-by: Richard Guy Briggs <rgb@redhat.com> > --- > kernel/audit_tree.c | 3 ++- > kernel/audit_watch.c | 3 ++- > kernel/auditfilter.c | 7 +++++-- > 3 files changed, 9 insertions(+), 4 deletions(-) Thanks for pointing these omissions out in the original patch. When a patch has obvious problems generally people just provide feedback and the patch author incorporates the fixes; this helps ensure we don't merge known broken patches, helping preserve `git bisect`. Do you mind if I incorporate these suggestions, and the one in patch 2/2, into the filtering patch in the original RFC patchset? I'll add a 'thank you' comment in the commit description as I did to the other patch where you provided feedback. I feel that is the proper way to handle this. > diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c > index 6c91902f4f45..2be285c2f069 100644 > --- a/kernel/audit_tree.c > +++ b/kernel/audit_tree.c > @@ -727,7 +727,8 @@ int audit_make_tree(struct audit_krule *rule, char *pathname, u32 op) > { > > if (pathname[0] != '/' || > - rule->listnr != AUDIT_FILTER_EXIT || > + (rule->listnr != AUDIT_FILTER_EXIT && > + rule->listnr != AUDIT_FILTER_URING_EXIT) || > op != Audit_equal || > rule->inode_f || rule->watch || rule->tree) > return -EINVAL; > diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c > index 2acf7ca49154..698b62b4a2ec 100644 > --- a/kernel/audit_watch.c > +++ b/kernel/audit_watch.c > @@ -183,7 +183,8 @@ int audit_to_watch(struct audit_krule *krule, char *path, int len, u32 op) > return -EOPNOTSUPP; > > if (path[0] != '/' || path[len-1] == '/' || > - krule->listnr != AUDIT_FILTER_EXIT || > + (krule->listnr != AUDIT_FILTER_EXIT && > + krule->listnr != AUDIT_FILTER_URING_EXIT) || > op != Audit_equal || > krule->inode_f || krule->watch || krule->tree) > return -EINVAL; > diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c > index c21119c00504..bcdedfd1088c 100644 > --- a/kernel/auditfilter.c > +++ b/kernel/auditfilter.c > @@ -153,7 +153,8 @@ char *audit_unpack_string(void **bufp, size_t *remain, size_t len) > static inline int audit_to_inode(struct audit_krule *krule, > struct audit_field *f) > { > - if (krule->listnr != AUDIT_FILTER_EXIT || > + if ((krule->listnr != AUDIT_FILTER_EXIT && > + krule->listnr != AUDIT_FILTER_URING_EXIT) || > krule->inode_f || krule->watch || krule->tree || > (f->op != Audit_equal && f->op != Audit_not_equal)) > return -EINVAL; > @@ -250,6 +251,7 @@ static inline struct audit_entry *audit_to_entry_common(struct audit_rule_data * > pr_err("AUDIT_FILTER_ENTRY is deprecated\n"); > goto exit_err; > case AUDIT_FILTER_EXIT: > + case AUDIT_FILTER_URING_EXIT: > case AUDIT_FILTER_TASK: > #endif > case AUDIT_FILTER_USER: > @@ -982,7 +984,8 @@ static inline int audit_add_rule(struct audit_entry *entry) > } > > entry->rule.prio = ~0ULL; > - if (entry->rule.listnr == AUDIT_FILTER_EXIT) { > + if (entry->rule.listnr == AUDIT_FILTER_EXIT || > + entry->rule.listnr == AUDIT_FILTER_URING_EXIT) { > if (entry->rule.flags & AUDIT_FILTER_PREPEND) > entry->rule.prio = ++prio_high; > else > -- > 2.27.0 -- paul moore www.paul-moore.com
WARNING: multiple messages have this Message-ID (diff)
From: Paul Moore <paul@paul-moore.com> To: Richard Guy Briggs <rgb@redhat.com> Cc: Jens Axboe <axboe@kernel.dk>, selinux@vger.kernel.org, linux-security-module@vger.kernel.org, linux-audit@redhat.com, Kumar Kartikeya Dwivedi <memxor@gmail.com>, linux-fsdevel@vger.kernel.org, io-uring@vger.kernel.org, Alexander Viro <viro@zeniv.linux.org.uk> Subject: Re: [PATCH 1/2] audit: add filtering for io_uring records, addendum Date: Mon, 7 Jun 2021 19:15:01 -0400 [thread overview] Message-ID: <CAHC9VhRa9dvCfPf5WHKYofrvQrGff7Lh+H4HMAhi_z3nK_rtoA@mail.gmail.com> (raw) In-Reply-To: <3a2903574a4d03f73230047866112b2dad9b4a9e.1622467740.git.rgb@redhat.com> On Mon, May 31, 2021 at 9:45 AM Richard Guy Briggs <rgb@redhat.com> wrote: > > The commit ("audit: add filtering for io_uring records") added support for > filtering io_uring operations. > > Add checks to the audit io_uring filtering code for directory and path watches, > and to keep the list counts consistent. > > Signed-off-by: Richard Guy Briggs <rgb@redhat.com> > --- > kernel/audit_tree.c | 3 ++- > kernel/audit_watch.c | 3 ++- > kernel/auditfilter.c | 7 +++++-- > 3 files changed, 9 insertions(+), 4 deletions(-) Thanks for pointing these omissions out in the original patch. When a patch has obvious problems generally people just provide feedback and the patch author incorporates the fixes; this helps ensure we don't merge known broken patches, helping preserve `git bisect`. Do you mind if I incorporate these suggestions, and the one in patch 2/2, into the filtering patch in the original RFC patchset? I'll add a 'thank you' comment in the commit description as I did to the other patch where you provided feedback. I feel that is the proper way to handle this. > diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c > index 6c91902f4f45..2be285c2f069 100644 > --- a/kernel/audit_tree.c > +++ b/kernel/audit_tree.c > @@ -727,7 +727,8 @@ int audit_make_tree(struct audit_krule *rule, char *pathname, u32 op) > { > > if (pathname[0] != '/' || > - rule->listnr != AUDIT_FILTER_EXIT || > + (rule->listnr != AUDIT_FILTER_EXIT && > + rule->listnr != AUDIT_FILTER_URING_EXIT) || > op != Audit_equal || > rule->inode_f || rule->watch || rule->tree) > return -EINVAL; > diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c > index 2acf7ca49154..698b62b4a2ec 100644 > --- a/kernel/audit_watch.c > +++ b/kernel/audit_watch.c > @@ -183,7 +183,8 @@ int audit_to_watch(struct audit_krule *krule, char *path, int len, u32 op) > return -EOPNOTSUPP; > > if (path[0] != '/' || path[len-1] == '/' || > - krule->listnr != AUDIT_FILTER_EXIT || > + (krule->listnr != AUDIT_FILTER_EXIT && > + krule->listnr != AUDIT_FILTER_URING_EXIT) || > op != Audit_equal || > krule->inode_f || krule->watch || krule->tree) > return -EINVAL; > diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c > index c21119c00504..bcdedfd1088c 100644 > --- a/kernel/auditfilter.c > +++ b/kernel/auditfilter.c > @@ -153,7 +153,8 @@ char *audit_unpack_string(void **bufp, size_t *remain, size_t len) > static inline int audit_to_inode(struct audit_krule *krule, > struct audit_field *f) > { > - if (krule->listnr != AUDIT_FILTER_EXIT || > + if ((krule->listnr != AUDIT_FILTER_EXIT && > + krule->listnr != AUDIT_FILTER_URING_EXIT) || > krule->inode_f || krule->watch || krule->tree || > (f->op != Audit_equal && f->op != Audit_not_equal)) > return -EINVAL; > @@ -250,6 +251,7 @@ static inline struct audit_entry *audit_to_entry_common(struct audit_rule_data * > pr_err("AUDIT_FILTER_ENTRY is deprecated\n"); > goto exit_err; > case AUDIT_FILTER_EXIT: > + case AUDIT_FILTER_URING_EXIT: > case AUDIT_FILTER_TASK: > #endif > case AUDIT_FILTER_USER: > @@ -982,7 +984,8 @@ static inline int audit_add_rule(struct audit_entry *entry) > } > > entry->rule.prio = ~0ULL; > - if (entry->rule.listnr == AUDIT_FILTER_EXIT) { > + if (entry->rule.listnr == AUDIT_FILTER_EXIT || > + entry->rule.listnr == AUDIT_FILTER_URING_EXIT) { > if (entry->rule.flags & AUDIT_FILTER_PREPEND) > entry->rule.prio = ++prio_high; > else > -- > 2.27.0 -- paul moore www.paul-moore.com -- Linux-audit mailing list Linux-audit@redhat.com https://listman.redhat.com/mailman/listinfo/linux-audit
next prev parent reply other threads:[~2021-06-07 23:16 UTC|newest] Thread overview: 144+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-21 21:49 [RFC PATCH 0/9] Add LSM access controls and auditing to io_uring Paul Moore 2021-05-21 21:49 ` Paul Moore 2021-05-21 21:49 ` [RFC PATCH 1/9] audit: prepare audit_context for use in calling contexts beyond syscalls Paul Moore 2021-05-21 21:49 ` Paul Moore 2021-05-21 21:49 ` [RFC PATCH 2/9] audit,io_uring,io-wq: add some basic audit support to io_uring Paul Moore 2021-05-21 21:49 ` [RFC PATCH 2/9] audit, io_uring, io-wq: " Paul Moore 2021-05-22 0:22 ` [RFC PATCH 2/9] audit,io_uring,io-wq: " Pavel Begunkov 2021-05-22 0:22 ` Pavel Begunkov 2021-05-22 2:36 ` Paul Moore 2021-05-22 2:36 ` Paul Moore 2021-05-23 20:26 ` Pavel Begunkov 2021-05-23 20:26 ` Pavel Begunkov 2021-05-24 19:59 ` Paul Moore 2021-05-24 19:59 ` Paul Moore 2021-05-25 8:27 ` Pavel Begunkov 2021-05-25 8:27 ` Pavel Begunkov 2021-05-25 14:53 ` Paul Moore 2021-05-25 14:53 ` Paul Moore 2021-05-26 1:11 ` Jens Axboe 2021-05-26 1:11 ` Jens Axboe 2021-05-26 2:04 ` Paul Moore 2021-05-26 2:04 ` Paul Moore 2021-05-26 10:19 ` Pavel Begunkov 2021-05-26 10:19 ` Pavel Begunkov 2021-05-26 14:38 ` Paul Moore 2021-05-26 14:38 ` Paul Moore 2021-05-26 15:11 ` Steve Grubb 2021-05-26 15:11 ` [RFC PATCH 2/9] audit, io_uring, io-wq: " Steve Grubb 2021-05-26 15:17 ` [RFC PATCH 2/9] audit,io_uring,io-wq: " Stefan Metzmacher 2021-05-26 15:17 ` Stefan Metzmacher 2021-05-26 15:49 ` Richard Guy Briggs 2021-05-26 15:49 ` Richard Guy Briggs 2021-05-26 17:22 ` Jens Axboe 2021-05-26 17:22 ` Jens Axboe 2021-05-27 17:27 ` Richard Guy Briggs 2021-05-27 17:27 ` Richard Guy Briggs 2021-05-26 15:49 ` Victor Stewart 2021-05-26 15:49 ` Victor Stewart 2021-05-26 16:38 ` Casey Schaufler 2021-05-26 16:38 ` Casey Schaufler 2021-05-26 17:15 ` Jens Axboe 2021-05-26 17:15 ` Jens Axboe 2021-05-26 17:31 ` Jens Axboe 2021-05-26 17:31 ` Jens Axboe 2021-05-26 17:54 ` Jens Axboe 2021-05-26 17:54 ` Jens Axboe 2021-05-26 18:01 ` Jens Axboe 2021-05-26 18:01 ` Jens Axboe 2021-05-26 18:44 ` Paul Moore 2021-05-26 18:44 ` Paul Moore 2021-05-26 18:57 ` Pavel Begunkov 2021-05-26 18:57 ` Pavel Begunkov 2021-05-26 19:10 ` Paul Moore 2021-05-26 19:10 ` Paul Moore 2021-05-26 19:44 ` Jens Axboe 2021-05-26 19:44 ` Jens Axboe 2021-05-26 20:19 ` Paul Moore 2021-05-26 20:19 ` Paul Moore 2021-05-28 16:02 ` Paul Moore 2021-05-28 16:02 ` Paul Moore 2021-06-02 8:26 ` Pavel Begunkov 2021-06-02 8:26 ` Pavel Begunkov 2021-06-02 15:46 ` Richard Guy Briggs 2021-06-02 15:46 ` Richard Guy Briggs 2021-06-03 10:39 ` Pavel Begunkov 2021-06-03 10:39 ` Pavel Begunkov 2021-06-02 19:46 ` Paul Moore 2021-06-02 19:46 ` Paul Moore 2021-06-03 10:51 ` Pavel Begunkov 2021-06-03 10:51 ` Pavel Begunkov 2021-06-03 15:54 ` Casey Schaufler 2021-06-03 15:54 ` Casey Schaufler 2021-06-03 15:54 ` Jens Axboe 2021-06-03 15:54 ` Jens Axboe 2021-06-04 5:04 ` Paul Moore 2021-06-04 5:04 ` Paul Moore 2021-05-26 18:38 ` Paul Moore 2021-05-26 18:38 ` Paul Moore 2021-06-02 17:29 ` [RFC PATCH 2/9] audit, io_uring, io-wq: " Richard Guy Briggs 2021-06-02 17:29 ` Richard Guy Briggs 2021-06-02 20:46 ` Paul Moore 2021-06-02 20:46 ` Paul Moore 2021-08-25 1:21 ` Richard Guy Briggs 2021-08-25 1:21 ` Richard Guy Briggs 2021-08-25 19:41 ` Paul Moore 2021-08-25 19:41 ` Paul Moore 2021-05-21 21:50 ` [RFC PATCH 3/9] audit: dev/test patch to force io_uring auditing Paul Moore 2021-05-21 21:50 ` Paul Moore 2021-05-21 21:50 ` [RFC PATCH 4/9] audit: add filtering for io_uring records Paul Moore 2021-05-21 21:50 ` Paul Moore 2021-05-28 22:35 ` Richard Guy Briggs 2021-05-28 22:35 ` Richard Guy Briggs 2021-05-30 15:26 ` Paul Moore 2021-05-30 15:26 ` Paul Moore 2021-05-31 13:44 ` Richard Guy Briggs 2021-05-31 13:44 ` Richard Guy Briggs 2021-06-02 1:40 ` Paul Moore 2021-06-02 1:40 ` Paul Moore 2021-06-02 15:37 ` Richard Guy Briggs 2021-06-02 15:37 ` Richard Guy Briggs 2021-06-02 17:20 ` Paul Moore 2021-06-02 17:20 ` Paul Moore 2021-05-31 13:44 ` [PATCH 1/2] audit: add filtering for io_uring records, addendum Richard Guy Briggs 2021-05-31 13:44 ` Richard Guy Briggs 2021-05-31 16:08 ` kernel test robot 2021-05-31 16:08 ` kernel test robot 2021-05-31 16:08 ` kernel test robot 2021-05-31 17:38 ` kernel test robot 2021-05-31 17:38 ` kernel test robot 2021-05-31 17:38 ` kernel test robot 2021-06-07 23:15 ` Paul Moore [this message] 2021-06-07 23:15 ` Paul Moore 2021-06-08 12:55 ` Richard Guy Briggs 2021-06-08 12:55 ` Richard Guy Briggs 2021-06-09 2:45 ` Paul Moore 2021-06-09 2:45 ` Paul Moore 2021-05-31 13:44 ` [PATCH 2/2] audit: block PERM fields being used with io_uring filtering Richard Guy Briggs 2021-05-31 13:44 ` Richard Guy Briggs 2021-05-21 21:50 ` [RFC PATCH 5/9] fs: add anon_inode_getfile_secure() similar to anon_inode_getfd_secure() Paul Moore 2021-05-21 21:50 ` Paul Moore 2021-05-21 21:50 ` [RFC PATCH 6/9] io_uring: convert io_uring to the secure anon inode interface Paul Moore 2021-05-21 21:50 ` Paul Moore 2021-05-21 21:50 ` [RFC PATCH 7/9] lsm,io_uring: add LSM hooks to io_uring Paul Moore 2021-05-21 21:50 ` Paul Moore 2021-05-26 14:48 ` Stefan Metzmacher 2021-05-26 14:48 ` Stefan Metzmacher 2021-05-26 20:45 ` Paul Moore 2021-05-26 20:45 ` Paul Moore 2021-05-21 21:50 ` [RFC PATCH 8/9] selinux: add support for the io_uring access controls Paul Moore 2021-05-21 21:50 ` Paul Moore 2021-05-21 21:50 ` [RFC PATCH 9/9] Smack: Brutalist io_uring support with debug Paul Moore 2021-05-21 21:50 ` Paul Moore 2021-05-22 0:53 ` [RFC PATCH 0/9] Add LSM access controls and auditing to io_uring Tetsuo Handa 2021-05-22 0:53 ` Tetsuo Handa 2021-05-22 2:06 ` Paul Moore 2021-05-22 2:06 ` Paul Moore 2021-05-26 15:00 ` Jeff Moyer 2021-05-26 15:00 ` Jeff Moyer 2021-05-26 18:49 ` Paul Moore 2021-05-26 18:49 ` Paul Moore 2021-05-26 19:07 ` Jeff Moyer 2021-05-26 19:07 ` Jeff Moyer 2021-05-26 19:10 ` Paul Moore 2021-05-26 19:10 ` Paul Moore
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=CAHC9VhRa9dvCfPf5WHKYofrvQrGff7Lh+H4HMAhi_z3nK_rtoA@mail.gmail.com \ --to=paul@paul-moore.com \ --cc=axboe@kernel.dk \ --cc=io-uring@vger.kernel.org \ --cc=linux-audit@redhat.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=memxor@gmail.com \ --cc=rgb@redhat.com \ --cc=selinux@vger.kernel.org \ --cc=viro@zeniv.linux.org.uk \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.