From nobody Wed Sep 30 13:51:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hvxKW5vgfz6tXpl for ; Wed, 30 Sep 2026 13:51:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hvxKW2KYRz3K6r for ; Wed, 30 Sep 2026 13:51:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790776287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=adpyTU3A0FoOtrzz2/cbUnASQTnWj3+YAqeDZT+DoIo=; b=ZLEpIHimeyWioEozQMwm8FHyykLIxEgBMqZnJRcL5VZwqzTqKWGWw8LbOL/XrZ8gbqnxGd nvooqJBaTPhyQgtYMlNdgnEYRZdwsztdTANyUJpi/tgYUH1Ditt2ciljYu75snQStpfwd7 Ux2UFM+xWAMMOin9DYDky7R27BFyIZ4PXt79kO/Ag1Pm4Z9Yj/IXfyEv2wmwbBRzz+phwA LJyH0LLoVCoTgP8+q0R4Vh/DDEGmmmQZdmgOa+jBe9W3OFn/bUQVxj4M/HD1cGtAh4/1tQ XKRCcfHxNNs3ROoPWwbVDlTYYOlEaLUfGvxfWm+m9cOQZSj1HTTGRlB3Gg1fhw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790776287; b=Py5BpACp/tqej0jcrCNo32e6nN/JfpzR8RFYcJuCevf2fhPwBgUmmiK5ocvY8dC9xJ+JPj PDXCKU9TisrhwGeZ4LDmF5t6Rm+VvZuwk56qidtlHqOnxw+4gREvdgx96xQ/CNgcM94TST U32thad/dTjalGU1fYwEAAUI0dvCXkiI9anajURBkOouk65y7Kq1IL9uTYli44h8wIPSgk Iqs3AlQVZSVoaUPAsajFDoY6zcwx9kVLQY3kPJ6hGRzRN3wbStVx3AKaeAH6XxARC/f95M 57a41/9BLA9c66TMrs7P0diZh+sykyfv+QQCY9X8kPO9LTuQy++aqDUT9hcgwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790776287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=adpyTU3A0FoOtrzz2/cbUnASQTnWj3+YAqeDZT+DoIo=; b=q1LQsMC13GiHzUqMFYViNNCAlw/pDetEGGF+k+0qC+ajL9lqQuQavOfRLNSLRvkBqscgDz yTiN4HYN/T8v9B0ug37ciHjsqg6FZ8iCiM2EpAIdC3HmY85d4JcXujuohbXZsi9M49gpG8 GoLo6zBPgmSLNeiyjlnjLwJeexZKYL7hBxibcO4f1TYdoAZ69SC3ZRURkSNWA2gK4eFjF8 vAarLvai+GQeK+htDJzevxIXB9gqwrizvkH0INNbjB/STGS8+D2LA4hiizb8l/Xw/uzdG8 qlQu/Nt7HnTwuGFjnzhlfzyC0h8Omu+pbY2W6kCZ80GwQxYQ0fp25Is+leUzDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hvxKW151nzpFk for ; Wed, 30 Sep 2026 13:51:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1caf2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 30 Sep 2026 13:51:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: dd5dc8f6e51c - main - epoch: Fix use-after-free in epoch_trace_report() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd5dc8f6e51c5132f2dc885f5c1b0492cdf3052c Auto-Submitted: auto-generated Date: Wed, 30 Sep 2026 13:51:27 +0000 Message-Id: <6abd13df.1caf2.585b618c@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=dd5dc8f6e51c5132f2dc885f5c1b0492cdf3052c commit dd5dc8f6e51c5132f2dc885f5c1b0492cdf3052c Author: R. Christian McDonald AuthorDate: 2026-09-30 13:41:53 +0000 Commit: R. Christian McDonald CommitDate: 2026-09-30 13:51:18 +0000 epoch: Fix use-after-free in epoch_trace_report() epoch_trace_report() assigned the return value of RB_INSERT() back to the new element. When two threads report the same stack concurrently, the loser's RB_INSERT() returns the element already in the tree, and that element was freed while still linked, leaking the new allocation. The next lookup touches freed memory; KASAN catches it as a use-after-free. Keep the return value separate and free the new element instead. The thread that won the race prints the report, so return without printing it a second time. Reviewed by: markj Fixes: 173c062a569b ("Improve EPOCH_TRACE") MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D60162 --- sys/kern/subr_epoch.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_epoch.c b/sys/kern/subr_epoch.c index 266230b04b43..e81b91295d48 100644 --- a/sys/kern/subr_epoch.c +++ b/sys/kern/subr_epoch.c @@ -193,6 +193,7 @@ epoch_trace_report(const char *fmt, ...) { va_list ap; struct stackentry se, *new; + bool dup; stack_save(&se.se_stack); @@ -205,10 +206,13 @@ epoch_trace_report(const char *fmt, ...) bcopy(&se.se_stack, &new->se_stack, sizeof(struct stack)); mtx_lock(&epoch_stacks_lock); - new = RB_INSERT(stacktree, &epoch_stacks, new); + dup = RB_INSERT(stacktree, &epoch_stacks, new) != NULL; mtx_unlock(&epoch_stacks_lock); - if (new != NULL) + if (dup) { + /* Lost a race; the other thread reports it. */ free(new, M_STACK); + return; + } } va_start(ap, fmt);