2021-01-26 13:17:59

by Menglong Dong

Subject: [PATCH] audit: Make audit_filter_syscall() return void

From: Yang Yang <[email protected]>

No invoker users the return value of audit_filter_syscall().
So make it return void.

Signed-off-by: Yang Yang <[email protected]>
---
kernel/auditsc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index ce8c9e2279ba..c8e16b9c0f21 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -804,7 +804,7 @@ static int audit_in_mask(const struct audit_krule *rule, unsigned long val)
* 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

2021-01-27 19:49:59

by Richard Guy Briggs

Subject: Re: [PATCH] audit: Make audit_filter_syscall() return void

On 2021-01-26 05:11, [email protected] wrote:
> From: Yang Yang <[email protected]>
>
> No invoker users the return value of audit_filter_syscall().
> So make it return void.

That was my oversight when ripping out the AUDIT_FILTER_ENTRY list:
5260ecc2e048 <[email protected]> 2018-02-14 ("audit: deprecate the AUDIT_FILTER_ENTRY filter")

Might as well also amend the function comment block to remove the
reference to syscall entry since that is no longer relevant.

> Signed-off-by: Yang Yang <[email protected]>

Reviewed-by: Richard Guy Briggs <[email protected]>

> ---
> kernel/auditsc.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/auditsc.c b/kernel/auditsc.c
> index ce8c9e2279ba..c8e16b9c0f21 100644
> --- a/kernel/auditsc.c
> +++ b/kernel/auditsc.c
> @@ -804,7 +804,7 @@ static int audit_in_mask(const struct audit_krule *rule, unsigned long val)
> * 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
>
> --
> Linux-audit mailing list
> [email protected]
> https://www.redhat.com/mailman/listinfo/linux-audit

- RGB

--
Richard Guy Briggs <[email protected]>
Sr. S/W Engineer, Kernel Security, Base Operating Systems
Remote, Ottawa, Red Hat Canada
IRC: rgb, SunRaycer
Voice: +1.647.777.2635, Internal: (81) 32635