Re: [PATCH 1/2] audit: add filtering for io_uring records, addendum

On Mon, May 31, 2021 at 9:45 AM Richard Guy Briggs <rgb(a)redhat.com&gt; 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(a)redhat.com&gt; > --- > 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 paul moore