From nobody Wed Oct 07 04:24:43 2026 X-Original-To: dev-commits-src-main@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 4j00QM1l6Lz6syD7 for ; Wed, 07 Oct 2026 04:24:43 +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 4j00QM1DbGz4psQ for ; Wed, 07 Oct 2026 04:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791347083; 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=Pq6KXaphn+OzcOO8AchMAzB1t/2ZYiEYKy2s7Fmgimnmr0DP7JGKLkwuonQmAb8ZTxI20f 8ZOvS0+xf9mP2wZpUURAmOqnutMT/e/N/WmeOC5XsRW3GmAXyGo2FUZryTtK3bYf+ghO7V fPQQ0NaoM3Zy080oB0eQzXv1fhOjwE7M+Gb/WVNupz+RYcubkmf44QUCkFIDiixNlJwFcs 9oOwFnuGpeaeAjdPrleva2e0OnnVHjxOgU+5OuBzYRAlmeBRg2Ug0skX1gjfld3aOBzoQE dpybfuvRtDwLNF5WjxXjRzQGUB68oIVQVR0CC2u/ej2uzN8N7eUXgAPunbudqg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791347083; b=Rk817crK+6okHl4lHfZcx4IxtBMPRatdT/SDVDRS8XN3GEgHbJuQkbgEsBDmsMuIJedcBs DgOrzoTZ9lFdyjwRxc7SpRBr9YtaI52huiKthK1GE8eBEZ4/m46EsqyQV0AXpKCOsQdmjc m/cA2Y2DYX+SXMSDs/yYFXLHxmYgb0dkql927YP/HzvXKPuVvV/Tvnfj0R2yp0BLMq81FY HmqIhFHNp5l+I8Fm3LrfFTpMMDYWPt8S0E0Oiqfxj3NuxhqSkSBTrE9UY6bvji6v6skvGD gf3wZRsvjYC3sNCkPa2xU4q4zONVS044v7AolNjFs0ZWlG5daYX08lx6oyr/eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791347083; 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=mP1MhuMCUqg0bpYzzo2wgSJzOV0sR0i+a06PhDMyqtqk34KzXuVZIUe8HCEPeIw1YDj0V6 qS6ureNYOKZHyluAqrswLtnK56SBqe41xmtJp8ysnAGZVK4xFLR5pzbp5TpxZEjWvMbrnf rEbuCuYf/nbknpTNXbbumm18aojRUCnnY1EndnLc/TGD5EOTCZ4DjNY5XJFNlCsH+zkZ/0 z5qs827oIDn910X2dzSlJ/onIdWZps3RcMda3eNRpL3UNFDYhs+QWOftwbNjhbo6qHdigr ZxAPkxoxBn7tZUs+RwvGInmGNZIIwUHASMAwY6s2jtXhXC9DnpOq+HyNzCuU7g== 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 4j00QM0K5FzdYN for ; Wed, 07 Oct 2026 04:24:43 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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; }