Skip to content

Commit 5504a69

Browse files
rgbriggspcmoore
authored andcommitted
audit: further cleanup of AUDIT_FILTER_ENTRY deprecation
Remove the list parameter from the function call since the exit filter list is the only remaining list used by this function. This cleans up commit 5260ecc ("audit: deprecate the AUDIT_FILTER_ENTRY filter") Signed-off-by: Richard Guy Briggs <[email protected]> Signed-off-by: Paul Moore <[email protected]>
1 parent a38fd87 commit 5504a69

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

kernel/auditsc.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -805,8 +805,7 @@ static int audit_in_mask(const struct audit_krule *rule, unsigned long val)
805805
* (i.e., the state is AUDIT_SETUP_CONTEXT or AUDIT_BUILD_CONTEXT).
806806
*/
807807
static void audit_filter_syscall(struct task_struct *tsk,
808-
struct audit_context *ctx,
809-
struct list_head *list)
808+
struct audit_context *ctx)
810809
{
811810
struct audit_entry *e;
812811
enum audit_state state;
@@ -815,7 +814,7 @@ static void audit_filter_syscall(struct task_struct *tsk,
815814
return;
816815

817816
rcu_read_lock();
818-
list_for_each_entry_rcu(e, list, list) {
817+
list_for_each_entry_rcu(e, &audit_filter_list[AUDIT_FILTER_EXIT], list) {
819818
if (audit_in_mask(&e->rule, ctx->major) &&
820819
audit_filter_rules(tsk, &e->rule, ctx, NULL,
821820
&state, false)) {
@@ -1627,8 +1626,7 @@ void __audit_free(struct task_struct *tsk)
16271626
context->return_valid = AUDITSC_INVALID;
16281627
context->return_code = 0;
16291628

1630-
audit_filter_syscall(tsk, context,
1631-
&audit_filter_list[AUDIT_FILTER_EXIT]);
1629+
audit_filter_syscall(tsk, context);
16321630
audit_filter_inodes(tsk, context);
16331631
if (context->current_state == AUDIT_RECORD_CONTEXT)
16341632
audit_log_exit();
@@ -1735,8 +1733,7 @@ void __audit_syscall_exit(int success, long return_code)
17351733
else
17361734
context->return_code = return_code;
17371735

1738-
audit_filter_syscall(current, context,
1739-
&audit_filter_list[AUDIT_FILTER_EXIT]);
1736+
audit_filter_syscall(current, context);
17401737
audit_filter_inodes(current, context);
17411738
if (context->current_state == AUDIT_RECORD_CONTEXT)
17421739
audit_log_exit();

0 commit comments

Comments
 (0)