* [PATCH -next] audit: correct audit_filter_inodes() definition
@ 2023-07-21 11:21 Xiu Jianfeng
2023-07-21 16:17 ` [PATCH] " Paul Moore
0 siblings, 1 reply; 2+ messages in thread
From: Xiu Jianfeng @ 2023-07-21 11:21 UTC (permalink / raw)
To: paul, eparis; +Cc: audit, linux-kernel
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>
---
kernel/audit.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/audit.h b/kernel/audit.h
index 94738bce40b2..a60d2840559e 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -334,7 +334,7 @@ static inline int audit_signal_info_syscall(struct task_struct *t)
return 0;
}
-#define audit_filter_inodes(t, c) AUDIT_STATE_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);
--
2.34.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] audit: correct audit_filter_inodes() definition
2023-07-21 11:21 [PATCH -next] audit: correct audit_filter_inodes() definition Xiu Jianfeng
@ 2023-07-21 16:17 ` Paul Moore
0 siblings, 0 replies; 2+ messages in thread
From: Paul Moore @ 2023-07-21 16:17 UTC (permalink / raw)
To: Xiu Jianfeng, eparis; +Cc: audit, linux-kernel
On Jul 21, 2023 Xiu Jianfeng <xiujianfeng@huawei.com> wrote:
>
> 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>
> ---
> kernel/audit.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Merged into audit/next, thanks.
--
paul-moore.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-07-21 16:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-21 11:21 [PATCH -next] audit: correct audit_filter_inodes() definition Xiu Jianfeng
2023-07-21 16:17 ` [PATCH] " Paul Moore
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®