From: Xiu Jianfeng xiujianfeng@huawei.com
mainline inclusion from mainline-v6.6-rc1 commit bf98354280bff22bc9e57c698d485c9e1c0b04f3 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I9SY02
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=...
--------------------------------
After changes in commit 0590b9335a1c ("fixing audit rule ordering mess, part 1"), audit_filter_inodes() returns void, so if CONFIG_AUDITSYSCALL not defined, it should be do {} while(0).
Signed-off-by: Xiu Jianfeng xiujianfeng@huawei.com Signed-off-by: Paul Moore paul@paul-moore.com
Conflicts: kernel/audit.h [Fix context conflicts] Signed-off-by: Felix Fu fuzhen5@huawei.com --- kernel/audit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/audit.h b/kernel/audit.h index 1918019e6aaf..9084d553b97b 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -326,7 +326,7 @@ static inline int audit_signal_info_syscall(struct task_struct *t) return 0; }
-#define audit_filter_inodes(t, c) AUDIT_DISABLED +#define audit_filter_inodes(t, c) do { } while (0) #endif /* CONFIG_AUDITSYSCALL */
extern char *audit_unpack_string(void **bufp, size_t *remain, size_t len);