Messages in this thread | | | From | Paul Moore <> | Date | Thu, 28 Jun 2018 18:10:44 -0400 | Subject | Re: [RFC PATCH ghak59 V1 2/6] audit: add syscall information to CONFIG_CHANGE records |
| |
On Thu, Jun 28, 2018 at 5:47 PM Paul Moore <paul@paul-moore.com> wrote: > > On Thu, Jun 14, 2018 at 4:23 PM Richard Guy Briggs <rgb@redhat.com> wrote: > > > > Tie syscall information to all CONFIG_CHANGE calls since they are all a > > result of user actions. > > > > See: https://github.com/linux-audit/audit-kernel/issues/59 > > See: https://github.com/linux-audit/audit-kernel/issues/50 > > Signed-off-by: Richard Guy Briggs <rgb@redhat.com> > > --- > > kernel/audit.c | 4 ++-- > > kernel/audit_fsnotify.c | 2 +- > > kernel/audit_tree.c | 2 +- > > kernel/audit_watch.c | 2 +- > > kernel/auditfilter.c | 2 +- > > 5 files changed, 6 insertions(+), 6 deletions(-) > > Merged, thanks.
Actually, I take that back (good thing I hadn't pushed yet).
Why don't you squash this patch with 3/6 so that a bisect or cherry-pick backport doesn't end up splitting 2/6 and 3/6 and causing a regression with the AUDIT_USER_* records.
> > diff --git a/kernel/audit.c b/kernel/audit.c > > index ad54339..e469234 100644 > > --- a/kernel/audit.c > > +++ b/kernel/audit.c > > @@ -400,7 +400,7 @@ static int audit_log_config_change(char *function_name, u32 new, u32 old, > > struct audit_buffer *ab; > > int rc = 0; > > > > - ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE); > > + ab = audit_log_start(audit_context(), GFP_KERNEL, AUDIT_CONFIG_CHANGE); > > if (unlikely(!ab)) > > return rc; > > audit_log_format(ab, "op=set %s=%u old=%u", function_name, new, old); > > @@ -1067,7 +1067,7 @@ static void audit_log_common_recv_msg(struct audit_buffer **ab, u16 msg_type) > > return; > > } > > > > - *ab = audit_log_start(NULL, GFP_KERNEL, msg_type); > > + *ab = audit_log_start(audit_context(), GFP_KERNEL, msg_type); > > if (unlikely(!*ab)) > > return; > > audit_log_format(*ab, "pid=%d uid=%u", pid, uid); > > diff --git a/kernel/audit_fsnotify.c b/kernel/audit_fsnotify.c > > index 52f368b..1640eb6 100644 > > --- a/kernel/audit_fsnotify.c > > +++ b/kernel/audit_fsnotify.c > > @@ -127,7 +127,7 @@ static void audit_mark_log_rule_change(struct audit_fsnotify_mark *audit_mark, c > > > > if (!audit_enabled) > > return; > > - ab = audit_log_start(NULL, GFP_NOFS, AUDIT_CONFIG_CHANGE); > > + ab = audit_log_start(audit_context(), GFP_NOFS, AUDIT_CONFIG_CHANGE); > > if (unlikely(!ab)) > > return; > > audit_log_format(ab, "auid=%u ses=%u op=%s", > > diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c > > index 5e9d1e5..a01b9da 100644 > > --- a/kernel/audit_tree.c > > +++ b/kernel/audit_tree.c > > @@ -499,7 +499,7 @@ static void audit_tree_log_remove_rule(struct audit_krule *rule) > > > > if (!audit_enabled) > > return; > > - ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE); > > + ab = audit_log_start(audit_context(), GFP_KERNEL, AUDIT_CONFIG_CHANGE); > > if (unlikely(!ab)) > > return; > > audit_log_format(ab, "op=remove_rule"); > > diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c > > index 9b4836b..da2978b 100644 > > --- a/kernel/audit_watch.c > > +++ b/kernel/audit_watch.c > > @@ -242,7 +242,7 @@ static void audit_watch_log_rule_change(struct audit_krule *r, struct audit_watc > > > > if (!audit_enabled) > > return; > > - ab = audit_log_start(NULL, GFP_NOFS, AUDIT_CONFIG_CHANGE); > > + ab = audit_log_start(audit_context(), GFP_NOFS, AUDIT_CONFIG_CHANGE); > > if (!ab) > > return; > > audit_log_format(ab, "auid=%u ses=%u op=%s", > > diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c > > index eaa3201..6e19acb 100644 > > --- a/kernel/auditfilter.c > > +++ b/kernel/auditfilter.c > > @@ -1093,7 +1093,7 @@ static void audit_log_rule_change(char *action, struct audit_krule *rule, int re > > if (!audit_enabled) > > return; > > > > - ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE); > > + ab = audit_log_start(audit_context(), GFP_KERNEL, AUDIT_CONFIG_CHANGE); > > if (!ab) > > return; > > audit_log_session_info(ab); > > -- > > 1.8.3.1 > > > > > -- > paul moore > www.paul-moore.com
-- paul moore www.paul-moore.com
| |