From nobody Wed Oct 07 04:24:43 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 4j00QS3t13z6sy9q for ; Wed, 07 Oct 2026 04:24:48 +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 4j00QS27yhz4q3f for ; Wed, 07 Oct 2026 04:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791347088; 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=Hwn8huG0DDVCUg+mPRYR4ArrYHGN4xH+IEr4roGKcyQ=; b=H7nlgLnCeW4naiBT7v8qczUpPcV1y05zIqZsxUMucxF9wrHU7ZqAwQP2sKMudjBRJgdw8r rVggQRSa6lcQgJlj4QsEFBucsGxKE1Q4agw0oGn5XgnQOr/NzW9zfTfUZHBoiWE8EF1wD8 XBnUqHTaKNZ90aU0BJXJ/OFMEL9e68UUBjYB9DPP7eD4vRHMN15yRCIifXSYPolrEq5WPu BuZgq75sUi4m3w8NXTudTRB15dRWzzB7jltkroCKYgA4v4eCAoPqBersre4c5zsTT7VuL9 LYoZdpiUHa0S6MPzdqw9Nk6T6gXARq0wPXi9KD5q385m3uU2PGZih0Ch8EmNdg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791347088; b=jU9ae/gRtFpM6HuADsGRmgfFhXBR92dCm7TaXfTZyGAjf8ttonHsuh6p3EQlfwwPevATe9 /xn9SrIiKURZKhSV5cWUR5QZ0VzeW0mdJp0Xp0ncFIpOLOrVzmu8wJhc17cJ/2JTI1ME62 M8FfoJQMrb28VK8qMQKeoOC3f1UpM2nbHfm4oC0X7h+nqX81rDHEXrCfV39sMj9Wey8qNX 0DeM3MAu0lDJvDvVbU8RVGhMzS10RzssoSBXSeJVnYerYiyv3eZvoS+UVg0uelUXN0k1mQ p0hgP0hD8j77+M1tEyZcVaTYvjdfuUL21LvIrU9S6PoKaolVafpuwpKrIXRWjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791347088; 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=Hwn8huG0DDVCUg+mPRYR4ArrYHGN4xH+IEr4roGKcyQ=; b=roY2w+TI3mgvLcFy2Y188pg0jrAsl7LwzI747Gw7W7JegcrNyxZQ1KlLMpbtcB/ERaoDld goLwHe+xSYRg1V4hyw+f1R2SM1KHqHSdpYnYI1m+45sy8+3a9km2Xphn49N7zp5B73j69o Xx7aNyojiKAPakiZ5azkl6mMBcpIKrjsnMyA1RqTbkKdwSKqWmmD0f6P2tWBsa1ABsSHPU Hb8W+RgC+5TlGvh7LmM+no6rcE9OL0LgiOvunYpKx9LjiV1XKvo7ROjkpJZhq7deIhviAD gBlmtOmVuwlgcm4MAi3KGzOAtRTT7cxGVPXL3qTm2EQEpC2cNjXXKkNnxwckCw== 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 4j00QS1DByzf46 for ; Wed, 07 Oct 2026 04:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3377a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 07 Oct 2026 04:24:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: 139fa2c12ddc - main - routing: fix rtentry use-after-free in multipath route append 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: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 139fa2c12ddc028048efe3946f2663dcfba9b122 Auto-Submitted: auto-generated Date: Wed, 07 Oct 2026 04:24:43 +0000 Message-Id: <6ac5c98b.3377a.2e95a855@gitrepo.freebsd.org> The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=139fa2c12ddc028048efe3946f2663dcfba9b122 commit 139fa2c12ddc028048efe3946f2663dcfba9b122 Author: Olivier Cochard AuthorDate: 2026-10-07 04:16:33 +0000 Commit: Olivier Cochard CommitDate: 2026-10-07 04:16:33 +0000 routing: fix rtentry use-after-free in multipath route append add_route_flags() drops the RIB lock and passes the existing entry, rt_orig, to add_route_flags_mpath(). If a concurrent delete removes the prefix in that window, the retry re-inserts rt_orig, which is then freed while still linked, crashing later in rn_match(). Pass the new rt instead, return ENOENT when the prefix is gone and RTM_F_CREATE is not set, and fix the rnd_orig NULL check. Approved by: pouria Fixes: c24a8f19c5d5 ("routing: fix rib_add_route_px()") Differential Revision: https://reviews.freebsd.org/D60353 --- sys/net/route/route_ctl.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sys/net/route/route_ctl.c b/sys/net/route/route_ctl.c index fa0f41a0a559..ef58a2845424 100644 --- a/sys/net/route/route_ctl.c +++ b/sys/net/route/route_ctl.c @@ -818,8 +818,13 @@ add_route_flags(struct rib_head *rnh, struct rtentry *rt, struct route_nhop_data nhop_can_multipath(rnd_add->rnd_nhop) && nhop_can_multipath(rnd_orig.rnd_nhop)) { + /* + * @rt_orig may be freed once unlocked. Pass @rt if any: it + * is what gets inserted if the prefix vanishes. + */ for (int i = 0; i < RIB_MAX_RETRIES; i++) { - error = add_route_flags_mpath(rnh, rt_orig, rnd_add, &rnd_orig, + error = add_route_flags_mpath(rnh, + rt != NULL ? rt : rt_orig, rnd_add, &rnd_orig, op_flags, rc); if (error != EAGAIN) break; @@ -855,6 +860,10 @@ add_route_flags_mpath(struct rib_head *rnh, struct rtentry *rt, struct route_nhop_data rnd_new; int error = 0; + /* Prefix vanished: nothing to append to, @rt may be deleted. */ + if (rnd_orig->rnd_nhop == NULL && !(op_flags & RTM_F_CREATE)) + return (ENOENT); + if (!NH_IS_NHGRP(rnd_add->rnd_nhop)) error = nhgrp_get_addition_group(rnh, rnd_orig, rnd_add, &rnd_new); else @@ -869,7 +878,8 @@ add_route_flags_mpath(struct rib_head *rnh, struct rtentry *rt, RIB_RLOCK(rnh); lookup_prefix_rt(rnh, rt, rnd_orig); RIB_RUNLOCK(rnh); - if (rnd_orig == NULL && !(op_flags & RTM_F_CREATE)) { + if (rnd_orig->rnd_nhop == NULL && + !(op_flags & RTM_F_CREATE)) { /* In this iteration route doesn't exist */ error = ENOENT; }