Skip to content

audit: backport kernel audit enhancements and fixes up to upstream v6.6

Ricardo Robaina requested to merge rrobaina/centos-stream-9:RHEL-9127 into main

JIRA: https://issues.redhat.com/browse/RHEL-9127
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=57449883

Backport selected trivial fixes, cleanups, and enhancements from upstream
up to version 6.6. This will help make Audit functionality more stable, bring
useful enhancements/fixes downstream, and ease future backports.

Ricardo Robaina (15):
audit: include security.h unconditionally
audit: correct audit_filter_inodes() definition
audit: fix possible soft lockup in __audit_inode_child()
audit: add space before parenthesis and around '=', "==", and '<'
audit: cleanup function braces and assignment-in-if-condition
audit: move trailing statements to next line
netfilter: nf_tables: Audit log setelem reset
netfilter: nf_tables: Audit log rule reset
netfilter: nf_tables: Unbreak audit log reset
netfilter: nf_tables: Fix entries val in rule reset audit log
selftests: netfilter: Test nf_tables audit logging
selftests: netfilter: Extend nft_audit.sh
netfilter: nf_tables: Deduplicate nft_register_obj audit logs
netfilter: nf_tables: audit log object reset once per table
selftests: netfilter: Run nft_audit.sh in its own netns

include/linux/audit.h | 2 +
kernel/acct.c | 2 +-
kernel/audit.c | 5 +-
kernel/audit.h | 2 +-
kernel/auditfilter.c | 19 +-
kernel/auditsc.c | 12 +-
net/netfilter/nf_tables_api.c | 160 ++++++++----
tools/testing/selftests/netfilter/.gitignore | 1 +
tools/testing/selftests/netfilter/Makefile | 4 +-
.../selftests/netfilter/audit_logread.c | 165 ++++++++++++
tools/testing/selftests/netfilter/config | 1 +
.../testing/selftests/netfilter/nft_audit.sh | 245 ++++++++++++++++++
12 files changed, 552 insertions(+), 66 deletions(-)
create mode 100644 tools/testing/selftests/netfilter/audit_logread.c
create mode 100644 tools/testing/selftests/netfilter/nft_audit.sh

Signed-off-by: Ricardo Robaina rrobaina@redhat.com

Edited by Ricardo Robaina

Merge request reports