Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 014149cc authored by Al Viro's avatar Al Viro
Browse files

[PATCH] deprecate AUDIT_POSSBILE 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d8945bb5

kernel/auditfilter.c

+5 −3
Original line number Diff line number Diff line
@@ -128,8 +128,11 @@ static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule) 
#endif

		;

	}

	if (rule->action != AUDIT_NEVER && rule->action != AUDIT_POSSIBLE &&

	    rule->action != AUDIT_ALWAYS)

	if (unlikely(rule->action == AUDIT_POSSIBLE)) {

		printk(KERN_ERR "AUDIT_POSSIBLE is deprecated\n");

		goto exit_err;

	}

	if (rule->action != AUDIT_NEVER && rule->action != AUDIT_ALWAYS)

		goto exit_err;

	if (rule->field_count > AUDIT_MAX_FIELDS)

		goto exit_err;
@@ -734,7 +737,6 @@ static int audit_filter_user_rules(struct netlink_skb_parms *cb, 
	}

	switch (rule->action) {

	case AUDIT_NEVER:    *state = AUDIT_DISABLED;	    break;

	case AUDIT_POSSIBLE: *state = AUDIT_BUILD_CONTEXT;  break;

	case AUDIT_ALWAYS:   *state = AUDIT_RECORD_CONTEXT; break;

	}

	return 1;

kernel/auditsc.c

+0 −1
Original line number Diff line number Diff line
@@ -307,7 +307,6 @@ static int audit_filter_rules(struct task_struct *tsk, 
	}

	switch (rule->action) {

	case AUDIT_NEVER:    *state = AUDIT_DISABLED;	    break;

	case AUDIT_POSSIBLE: *state = AUDIT_BUILD_CONTEXT;  break;

	case AUDIT_ALWAYS:   *state = AUDIT_RECORD_CONTEXT; break;

	}

	return 1;