From nobody Mon Oct 26 19:46:55 2026 X-Original-To: dev-commits-src-branches@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 4jD3zh3lFqz6xWhL for ; Mon, 26 Oct 2026 19:46:56 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jD3zh07xKz4qpM for ; Mon, 26 Oct 2026 19:46:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793044016; 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=LtHi/hLrpbeUnHFpdPeDu3EDJ5k1DO/ldXfVemB1Tw4=; b=AsMZF4qHBfQ2rFNgD7QSe+TX99cpmYX4fhyLk9UzqYLchf6XRUeR0dLLzfWj83RYtRegDP zpPmMY+SaCiDeV8rhMu2Xfa7kks2yet2WyEiSlkt0Dw/DWj6cqhUitYEwSVjsm+KQjntPe MffnZOQ3yupuP2zcjfqzN+5AtHBi6WMpH3pK1dA0CBKC77fGV3/akKCwr5JOyBSVh0O+8s wu4t2cXnmTwgqAiKk/KENRR0ccZTkAGvzdcBCahWAC1ZWvV+nFI1XJbOm6pwbcXg1+KU9i /11Lxp5JdP543vGz+xIH4/KKnbse4ajdc4VeH71Epjgwnth4WawVv2BHqnZp/A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793044016; b=JmTRzIc39Ib1mFIbnmgQrNMg02eP2P1KqYoQ61wEh5dO/JQN0xNTVTBfjzvoABxXQb+dF8 gMe8qYL4kKDxNdZIYR5ESDKx1U9FzHIl+DRrJ16qV4+Turq/hISKTmGNuEIJN5hfztCBDa sLDnNBDkyLmoV1lQJldBQc+w1MRQDDtnhKFoWCkYzb2BWP1ub6PcOXaBQOqYPjjtKSy8qj sElFi99PuHthPFT1S56KkbiPejwAKznkRwWzx7SpGzW8LqBpqjb8YlrYG+UsJOJHudAGAZ PlkleIKWJFnLCsC5cxOXCKePmAxqz9pstiFOfjQ5KVdpawpyWbutWxw/Q3GTDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793044016; 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=LtHi/hLrpbeUnHFpdPeDu3EDJ5k1DO/ldXfVemB1Tw4=; b=rXSX2sBYCFX6y6zdjWTTih7lYwn1brmEv6nIL8qo/q2YjitoyYUI+zJ/eOdq08Z4nTM4tM 4R/RHAz8FDHp7UP3F90aXKBbVHEn8Z/wGPu9kt8DfedKYEzHPp+gSuoI7ZZZkQkJVWSqnD 3bljJgcX0EcxcgTKq6cZuMoOWgRthatBxOkwZmXnR0hiimSU0v2Q24LfYpERO5tn75wL3/ VZJyliCabHNtAgoCF51Ldt/TdYGpYQVTaayIoVVUbpxmAKt7XnMxWZ748OE7XyXkLb6qn+ DNyau0/l84O7JSksJQcnywLPgi2r964I61l904kCScGyQutGZPaNnHt+3HKwGQ== 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 4jD3zg6whGzpM3 for ; Mon, 26 Oct 2026 19:46:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a24b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Oct 2026 19:46:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 240680dfd4e2 - stable/14 - icmp: Limit routing table updates to the FIB of the redirect List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 240680dfd4e2cbbe9737eb78d43db30c7ca8ef38 Auto-Submitted: auto-generated Date: Mon, 26 Oct 2026 19:46:55 +0000 Message-Id: <6adfae2f.3a24b.49d37b60@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=240680dfd4e2cbbe9737eb78d43db30c7ca8ef38 commit 240680dfd4e2cbbe9737eb78d43db30c7ca8ef38 Author: Mark Johnston AuthorDate: 2026-09-17 13:14:49 +0000 Commit: Mark Johnston CommitDate: 2026-10-26 14:12:15 +0000 icmp: Limit routing table updates to the FIB of the redirect When we receive an ICMP redirect, rib_add_redirect() is used to apply the redirect to all FIBs. This has been the case since support for multiple FIBs was added. However, it seems rather dubious: the new gateway might not be routable from all FIBs, and the validation done for v4 redirects in icmp_verify_redirect_gateway() is only applied to the FIB from which the redirect originated. Modify the handler to apply the redirect only in the originating FIB. Reported by: Yuxiang Yang, Yizhou Zhao, Ao Wang, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM-5.1 from Z.ai Reviewed by: pouria, zlei, glebius, melifaro MFC after: 3 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59567 (cherry picked from commit 01a95394abfdef2adb3216e74d88b9c33321260e) --- sys/netinet/ip_icmp.c | 11 ++++------- sys/netinet6/icmp6.c | 8 +++----- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 29ce294fefd2..14a0c67c5bbe 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -466,7 +466,6 @@ icmp_input(struct mbuf **mp, int *offp, int proto) int hlen = *offp; int icmplen = ntohs(ip->ip_len) - *offp; int i, code; - int fibnum; NET_EPOCH_ASSERT(); @@ -737,12 +736,10 @@ reflect: break; } - for ( fibnum = 0; fibnum < rt_numfibs; fibnum++) { - rib_add_redirect(fibnum, (struct sockaddr *)&icmpsrc, - (struct sockaddr *)&icmpdst, - (struct sockaddr *)&icmpgw, m->m_pkthdr.rcvif, - RTF_GATEWAY, V_redirtimeout); - } + rib_add_redirect(M_GETFIB(m), (struct sockaddr *)&icmpsrc, + (struct sockaddr *)&icmpdst, + (struct sockaddr *)&icmpgw, m->m_pkthdr.rcvif, + RTF_GATEWAY, V_redirtimeout); break; /* diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 3fe0bec536e8..09eb49769dcb 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2356,7 +2356,6 @@ icmp6_redirect_input(struct mbuf *m, int off) struct sockaddr_in6 ssrc; struct sockaddr *gw; int rt_flags; - u_int fibnum; bzero(&sdst, sizeof(sdst)); bzero(&ssrc, sizeof(ssrc)); @@ -2375,10 +2374,9 @@ icmp6_redirect_input(struct mbuf *m, int off) rt_flags |= RTF_GATEWAY; } else gw = ifp->if_addr->ifa_addr; - for (fibnum = 0; fibnum < rt_numfibs; fibnum++) - rib_add_redirect(fibnum, (struct sockaddr *)&sdst, gw, - (struct sockaddr *)&ssrc, ifp, rt_flags, - V_icmp6_redirtimeout); + rib_add_redirect(M_GETFIB(m), (struct sockaddr *)&sdst, gw, + (struct sockaddr *)&ssrc, ifp, rt_flags, + V_icmp6_redirtimeout); } freeit: