* [PATCH v2] audit: Make audit_filter_syscall() return void
@ 2021-01-27 2:51 menglong8.dong
2021-01-28 3:00 ` Paul Moore
0 siblings, 1 reply; 2+ messages in thread
From: menglong8.dong @ 2021-01-27 2:51 UTC (permalink / raw)
To: paul; +Cc: eparis, linux-audit, linux-kernel, Yang Yang, Richard Guy Briggs
From: Yang Yang <yang.yang29@zte.com.cn>
No invoker uses the return value of audit_filter_syscall().
So make it return void, and amend the comment of
audit_filter_syscall().
Changes since v1:
- amend the comment of audit_filter_syscall().
Signed-off-by: Yang Yang <yang.yang29@zte.com.cn>
Reviewed-by: Richard Guy Briggs <rgb@redhat.com>
---
kernel/auditsc.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index ce8c9e2279ba..434337ab6b2b 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -799,12 +799,12 @@ static int audit_in_mask(const struct audit_krule *rule, unsigned long val)
return rule->mask[word] & bit;
}
-/* At syscall entry and exit time, this filter is called if the
- * audit_state is not low enough that auditing cannot take place, but is
- * also not high enough that we already know we have to write an audit
- * record (i.e., the state is AUDIT_SETUP_CONTEXT or AUDIT_BUILD_CONTEXT).
+/* At syscall exit time, this filter is called if the audit_state is
+ * not low enough that auditing cannot take place, but is also not
+ * high enough that we already know we have to write an audit record
+ * (i.e., the state is AUDIT_SETUP_CONTEXT or AUDIT_BUILD_CONTEXT).
*/
-static enum audit_state audit_filter_syscall(struct task_struct *tsk,
+static void audit_filter_syscall(struct task_struct *tsk,
struct audit_context *ctx,
struct list_head *list)
{
@@ -812,7 +812,7 @@ static enum audit_state audit_filter_syscall(struct task_struct *tsk,
enum audit_state state;
if (auditd_test_task(tsk))
- return AUDIT_DISABLED;
+ return;
rcu_read_lock();
list_for_each_entry_rcu(e, list, list) {
@@ -821,11 +821,11 @@ static enum audit_state audit_filter_syscall(struct task_struct *tsk,
&state, false)) {
rcu_read_unlock();
ctx->current_state = state;
- return state;
+ return;
}
}
rcu_read_unlock();
- return AUDIT_BUILD_CONTEXT;
+ return;
}
/*
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] audit: Make audit_filter_syscall() return void
2021-01-27 2:51 [PATCH v2] audit: Make audit_filter_syscall() return void menglong8.dong
@ 2021-01-28 3:00 ` Paul Moore
0 siblings, 0 replies; 2+ messages in thread
From: Paul Moore @ 2021-01-28 3:00 UTC (permalink / raw)
To: menglong8.dong
Cc: Eric Paris, linux-audit, linux-kernel, Yang Yang, Richard Guy Briggs
On Tue, Jan 26, 2021 at 9:52 PM <menglong8.dong@gmail.com> wrote:
>
> From: Yang Yang <yang.yang29@zte.com.cn>
>
> No invoker uses the return value of audit_filter_syscall().
> So make it return void, and amend the comment of
> audit_filter_syscall().
>
> Changes since v1:
> - amend the comment of audit_filter_syscall().
>
> Signed-off-by: Yang Yang <yang.yang29@zte.com.cn>
> Reviewed-by: Richard Guy Briggs <rgb@redhat.com>
> ---
> kernel/auditsc.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
This is a simple enough patch so I think merging it during -rc5 should
be okay; merged into audit/next - thanks!
--
paul moore
www.paul-moore.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-28 3:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-27 2:51 [PATCH v2] audit: Make audit_filter_syscall() return void menglong8.dong
2021-01-28 3:00 ` Paul Moore
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).