On Fri, Mar 26, 2021 at 1:39 PM Richard Guy Briggs <[email protected]> wrote: > > Reduce logging of nftables events to a level similar to iptables. > Restore the table field to list the table, adding the generation. > > Indicate the op as the most significant operation in the event. > > A couple of sample events: > > type=PROCTITLE msg=audit(2021-03-18 09:30:49.801:143) : > proctitle=/usr/bin/python3 -s /usr/sbin/firewalld --nofork --nopid > type=SYSCALL msg=audit(2021-03-18 09:30:49.801:143) : arch=x86_64 > syscall=sendmsg success=yes exit=172 a0=0x6 a1=0x7ffdcfcbe650 a2=0x0 > a3=0x7ffdcfcbd52c items=0 ppid=1 pid=367 auid=unset uid=root gid=root > euid=root suid=root fsuid=root egid=roo > t sgid=root fsgid=root tty=(none) ses=unset comm=firewalld > exe=/usr/bin/python3.9 subj=system_u:system_r:firewalld_t:s0 key=(null) > type=NETFILTER_CFG msg=audit(2021-03-18 09:30:49.801:143) : table=firewalld:2 > family=ipv6 entries=1 op=nft_register_table pid=367 > subj=system_u:system_r:firewalld_t:s0 comm=firewalld > type=NETFILTER_CFG msg=audit(2021-03-18 09:30:49.801:143) : table=firewalld:2 > family=ipv4 entries=1 op=nft_register_table pid=367 > subj=system_u:system_r:firewalld_t:s0 comm=firewalld > type=NETFILTER_CFG msg=audit(2021-03-18 09:30:49.801:143) : table=firewalld:2 > family=inet entries=1 op=nft_register_table pid=367 > subj=system_u:system_r:firewalld_t:s0 comm=firewalld > > type=PROCTITLE msg=audit(2021-03-18 09:30:49.839:144) : > proctitle=/usr/bin/python3 -s /usr/sbin/firewalld --nofork --nopid > type=SYSCALL msg=audit(2021-03-18 09:30:49.839:144) : arch=x86_64 > syscall=sendmsg success=yes exit=22792 a0=0x6 a1=0x7ffdcfcbe650 a2=0x0 > a3=0x7ffdcfcbd52c items=0 ppid=1 pid=367 auid=unset uid=root gid=root > euid=root suid=root fsuid=root egid=r > oot sgid=root fsgid=root tty=(none) ses=unset comm=firewalld > exe=/usr/bin/python3.9 subj=system_u:system_r:firewalld_t:s0 key=(null) > type=NETFILTER_CFG msg=audit(2021-03-18 09:30:49.839:144) : table=firewalld:3 > family=ipv6 entries=30 op=nft_register_chain pid=367 > subj=system_u:system_r:firewalld_t:s0 comm=firewalld > type=NETFILTER_CFG msg=audit(2021-03-18 09:30:49.839:144) : table=firewalld:3 > family=ipv4 entries=30 op=nft_register_chain pid=367 > subj=system_u:system_r:firewalld_t:s0 comm=firewalld > type=NETFILTER_CFG msg=audit(2021-03-18 09:30:49.839:144) : table=firewalld:3 > family=inet entries=165 op=nft_register_chain pid=367 > subj=system_u:system_r:firewalld_t:s0 comm=firewalld > > The issue was originally documented in > https://github.com/linux-audit/audit-kernel/issues/124 > > Signed-off-by: Richard Guy Briggs <[email protected]> > --- > Changelog: > v5: > (sorry for all the noise...) > - fix kbuild missing prototype warning in > nf_tables_commit_audit_{alloc,collect,log}() <[email protected]> > > v4: > - move nf_tables_commit_audit_log() before nf_tables_commit_release() [fw] > - move nft2audit_op[] from audit.h to nf_tables_api.c > > v3: > - fix function braces, reduce parameter scope [pna] > - pre-allocate nft_audit_data per table in step 1, bail on ENOMEM [pna] > > v2: > - convert NFT ops to array indicies in nft2audit_op[] [ps] > - use linux lists [pna] > - use functions for each of collection and logging of audit data [pna] > --- > net/netfilter/nf_tables_api.c | 187 +++++++++++++++++++--------------- > 1 file changed, 104 insertions(+), 83 deletions(-)
Netfilter folks, were you planning to pull this via your tree/netdev or would you like me to merge this via the audit tree? If the latter, I would appreciate it if I could get an ACK from one of you; if the former, my ACK is below. Acked-by: Paul Moore <[email protected]> -- paul moore www.paul-moore.com
