mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Bradley Morgan <brads@mainlining.org>
To: "Jérémy Jean" <Jeremy.Jean@oss.cyber.gouv.fr>,
	"Paul Moore" <paul@paul-moore.com>,
	"Eric Paris" <eparis@redhat.com>
Cc: rrobaina@redhat.com, audit@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] audit: fix exe mark UAF in kill_rules()
Date: Tue, 22 Sep 2026 21:31:31 +0100	[thread overview]
Message-ID: <3243770A-7E27-4142-9467-FC1FC98A72F1@mainlining.org> (raw)
In-Reply-To: <20260922202734.1344770-2-Jeremy.Jean@oss.cyber.gouv.fr>

On 22 September 2026 21:27:35 BST, "Jérémy Jean"
<Jeremy.Jean@oss.cyber.gouv.fr> wrote:
>kill_rules() removes mixed AUDIT_DIR and AUDIT_EXE rules when an audit
>tree is pruned. It drops entry->rule.exe before removing the rule from
>the RCU-visible filter lists.
>
>After a rule has been installed with AUDIT_ADD_RULE, which requires
>CAP_AUDIT_CONTROL, removing the watched directory can race with another
>task that is still evaluating the rule. In that case, fsnotify can free
>the executable mark before the reader reaches audit_mark_compare(),
>causing a use-after-free.
>
>KASAN reports:
>
>    BUG: KASAN: slab-use-after-free in audit_mark_compare+0x8d/0xa0
>
>Unlink the published rules from the RCU-visible lists and retain them
>on tree->rules for cleanup. If any rule has an executable mark, wait for
>a single RCU grace period before removing the marks and scheduling the
>entries for freeing. Otherwise, call_rcu() already provides the required
>deferred freeing without a synchronous wait.
>
>Fixes: 34d99af52ad4 ("audit: implement audit by executable")
>Assisted-by: Codex:gpt-5

Reviewed-by: Bradley Morgan <brads@mainlining.org>


>Signed-off-by: Jérémy Jean <Jeremy.Jean@oss.cyber.gouv.fr>
>---
>
>v2: Address Sashiko's review with Ricardo Robaina's improved patch:
>- Batch executable-mark teardown behind one synchronize_rcu() after
>  unlinking all rules, instead of waiting once per rule under the audit
>  mutexes.
>- Skip the synchronous wait when none of the removed rules has an
>  executable mark.
>
>v1: https://lore.kernel.org/all/20260921195921.4174830-2-Jeremy.Jean@oss.cyber.gouv.fr/
>
> kernel/audit_tree.c | 24 ++++++++++++++++++++----
> 1 file changed, 20 insertions(+), 4 deletions(-)
>
>diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
>index 1ed19b775912..f2e81be8265e 100644
>--- a/kernel/audit_tree.c
>+++ b/kernel/audit_tree.c
>@@ -545,22 +545,38 @@ static void kill_rules(struct audit_context *context, struct audit_tree *tree)
> {
> 	struct audit_krule *rule, *next;
> 	struct audit_entry *entry;
>+	bool need_sync = false;
> 
> 	list_for_each_entry_safe(rule, next, &tree->rules, rlist) {
> 		entry = container_of(rule, struct audit_entry, rule);
> 
>-		list_del_init(&rule->rlist);
> 		if (rule->tree) {
> 			/* not a half-baked one */
> 			audit_tree_log_remove_rule(context, rule);
>-			if (entry->rule.exe)
>-				audit_remove_mark(entry->rule.exe);
> 			rule->tree = NULL;
> 			list_del_rcu(&entry->list);
> 			list_del(&entry->rule.list);
>-			call_rcu(&entry->rcu, audit_free_rule_rcu);
>+			if (entry->rule.exe)
>+				need_sync = true;
>+		} else {
>+			list_del_init(&rule->rlist);
> 		}
> 	}
>+
>+	if (list_empty(&tree->rules))
>+		return;
>+
>+	if (need_sync)
>+		synchronize_rcu();
>+
>+	list_for_each_entry_safe(rule, next, &tree->rules, rlist) {
>+		entry = container_of(rule, struct audit_entry, rule);
>+
>+		list_del_init(&rule->rlist);
>+		if (entry->rule.exe)
>+			audit_remove_mark(entry->rule.exe);
>+		call_rcu(&entry->rcu, audit_free_rule_rcu);
>+	}
> }
> 
> /*

--- Thanks!
"I'm not a very positive person" - Linus torvalds

  reply	other threads:[~2026-09-22 20:31 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-22 20:27 Jérémy Jean
2026-09-22 20:31 ` Bradley Morgan [this message]
2026-09-23 11:55 ` Ricardo Robaina
2026-09-25 20:18 ` Paul Moore

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3243770A-7E27-4142-9467-FC1FC98A72F1@mainlining.org \
    --to=brads@mainlining.org \
    --cc=Jeremy.Jean@oss.cyber.gouv.fr \
    --cc=audit@vger.kernel.org \
    --cc=eparis@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=paul@paul-moore.com \
    --cc=rrobaina@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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®