On Mon, May 16, 2022 at 4:22 PM Richard Guy Briggs <rgb@xxxxxxxxxx> wrote: > > This patch passes the full value so that the audit function can use all > of it. The audit function was updated to log the additional information in > the AUDIT_FANOTIFY record. The following is an example of the new record > format: > > type=FANOTIFY msg=audit(1600385147.372:590): resp=2 fan_type=1 fan_ctx=17 > > Suggested-by: Steve Grubb <sgrubb@xxxxxxxxxx> > Link: https://lore.kernel.org/r/3075502.aeNJFYEL58@x2 > Signed-off-by: Richard Guy Briggs <rgb@xxxxxxxxxx> > --- > fs/notify/fanotify/fanotify.c | 4 +++- > include/linux/audit.h | 9 +++++---- > kernel/auditsc.c | 18 +++++++++++++++--- > 3 files changed, 23 insertions(+), 8 deletions(-) ... > diff --git a/kernel/auditsc.c b/kernel/auditsc.c > index 6973be0bf6c9..cb93c6ed07cd 100644 > --- a/kernel/auditsc.c > +++ b/kernel/auditsc.c > @@ -2893,10 +2894,21 @@ void __audit_log_kern_module(char *name) > context->type = AUDIT_KERN_MODULE; > } > > -void __audit_fanotify(u32 response) > +void __audit_fanotify(u32 response, u32 type, union fanotify_response_extra *info) > { > - audit_log(audit_context(), GFP_KERNEL, > - AUDIT_FANOTIFY, "resp=%u", response); > + switch (type) { > + case FAN_RESPONSE_INFO_AUDIT_RULE: > + audit_log(audit_context(), GFP_KERNEL, AUDIT_FANOTIFY, > + "resp=%u fan_type=%u fan_ctx=%u", > + response, type, info->audit_rule); > + break; > + case FAN_RESPONSE_INFO_NONE: > + default: > + audit_log(audit_context(), GFP_KERNEL, AUDIT_FANOTIFY, > + "resp=%u fan_type=%u fan_ctx=?", > + response, type); > + break; > + } > } Two things: * Instead of "fan_ctx=", would it make sense to call it "fan_extra=" to better match the UAPI struct? I don't feel strongly either way, but it did occur to me just now while looking at the code so I thought I would mention it. * I'm also wondering if there is a way to be a bit proactive about future proofing this field. Since we already hex encode some fields with "bad" characters, would it make sense to hex encode this field too? Not for the "bad" character reason, but more as a way of marshalling the fanotify_response_extra union into an audit record. I can't see far enough into the future to know if this would be a good idea or not, but like the other point above, it popped into my head while looking at the code so I thought I would put it in the email :) -- paul-moore.com
