From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794048938; b=5Fpocd1P7wTA1LaYemh6dzrN95bjS8q/gW3nIbrRX/q0oFf2SgSDDSopy3mrYSHR6rYR bT+4iqB/VfbjmTdvlSf6kX/29kHGyc8jIkTXeizmc6UyxaMTTEQZWqT4MEg5WhpK1XvEs RqkbaJy2fVSc9Lmy/xe06YhrHp/+/clkUCEZeXDuXYAq3SZv8BeUESf2zixWT7d/t2wh1 fBwJ03aCfCVnalRaaiv9AqymQMwpIvX9WNg1OfO6oHEfQIk6tuxFkCgFRDJGwIMVqsqjJ VB6G+VrfpOlI75S+Gu1T63AHpeg+fPoIpVwMv53ujA21jLFvoyU6tFc/7WOlA2bEagQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794048938; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=UenQPAMEGDeTGRr4LHKaR+VgeTjMjQhapTA25L6BDsg=; b=3q9n0xxBPmYux0oNlCxV6aTffCW/dojRmtqEqwg96UtloNDib8iXuZrqHbCjTIKqPPTB IHXh8rOy08/facq9qs/SMRF9ZFK3XGEf/vaviE3PQOxTIPxPzsdaPt+I2s9gLUXYK0arf iCdv811x1M/orDY6r2O7uy0zsTsWTErbw1igMBbiWwejq50OCWNAvtP9hMptoEBHsKpVh ZxzeP15DuH5yxhD1nzNLOq4rK6asmrAN1hBJAYt6g58JBxYLx2HNLlHK4XzVPw3szcJgl 2/Tq/7W9JI+6VeP5/ABw7Tzup1UIOORVDJp7WGXi06qLCdQljJAdwLS+2RazJu2UC0Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=F3FP2s+5; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1E33E606A326 for ; Sat, 7 Nov 2026 10:55:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=F3FP2s+5 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 488291F0089F; Sat, 7 Nov 2026 10:55:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794048938; bh=UenQPAMEGDeTGRr4LHKaR+VgeTjMjQhapTA25L6BDsg=; h=From:To:Cc:Subject:Date; b=F3FP2s+5d26t5kD7uzibdOIc8wxjxSn5Q7n/knvZVqyzHEUEzl5bW1itso6+9NKyI TIM3eHivVhPvn+Piu+aE2bXtbxMIzsk3IoGDR0biBpuf6da8K9ci6nWrCvCUUkKnFh T376KX45SCdZCrdgIczTXkYJogQazfY4oV62qnsgtn9aJ5evDExHdCfqz2X176GFzc VdcyW5ysGO77tkbNiedI087d92aM7X4ZiHhtW+b8+GW5g29+x/p/s2AlWjsnHOkGrK 7AkIHu/j/tkGEjOP1+85JgYt5BIBO3UZ7vIqlvAan1jxJ+99WEf/rrWIMF5b5kym09 CQWKQae/9NSIA== From: Sasha Levin To: zhilinz@nebusec.ai, vega@nebusec.ai, idosch@nvidia.com, namangulati@google.com, kuba@kernel.org Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] ipmr: drop packets with unknown ingress VIF" failed to apply to 6.1-stable tree Date: Sat, 7 Nov 2026 05:55:36 -0500 Message-ID: <20261107055535-failed-6.1-09280680f2ea@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.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 The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 09280680f2ea060514be2a39ea84209fb6d721d4 # git commit -s git send-email --to '' --in-reply-to '20261107055535-failed-6.1-09280680f2ea@kernel.org' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 09280680f2ea060514be2a39ea84209fb6d721d4 Mon Sep 17 00:00:00 2001 From: Zhiling Zou Date: Thu, 22 Oct 2026 03:01:16 +0800 Subject: [PATCH] ipmr: drop packets with unknown ingress VIF A packet can race with VIF publication and make ipmr_find_vif() return -1 even though the VIF device pointer is already visible. The parent VIF device check can then pass with an invalid ingress VIF. For (*,G) entries, this can also let the packet be forwarded back out its ingress VIF. Drop packets whose ingress VIF lookup fails in both IPv4 and IPv6 forwarding, before checking the MFC parent device. This prevents forwarding with an unknown ingress VIF and avoids the (*,G) hairpin. Without the early check, the negative index can reach the IPv4 offload lookup only for an skb marked for L3 forwarding offload, currently done by mlxsw. The race is rare; the supplied PoC reports only the UBSAN negative-index diagnostic. Fixes: 4eadb88244d1 ("ipmr: do not acquire mrt_lock while calling ip_mr_forward()") Fixes: 9b1c21d898fd ("ip6mr: do not acquire mrt_lock while calling ip6_mr_forward()") Cc: stable@vger.kernel.org Reported-by: Vega Link: https://lore.kernel.org/netdev/b966eb102e98f299e45be59ada033a8766e4c6df.1791899747.git.zhilinz@nebusec.ai/ Suggested-by: Ido Schimmel Suggested-by: Naman Gulati Signed-off-by: Zhiling Zou Reviewed-by: Naman Gulati Reviewed-by: Ido Schimmel Link: https://patch.msgid.link/5271fcb94a4d9e697ed64a348e92ea9e74faab1c.1792608753.git.zhilinz@nebusec.ai Signed-off-by: Jakub Kicinski --- net/ipv4/ipmr.c | 3 ++- net/ipv6/ip6mr.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 915b210c4512b..e8f7d3b573d0f 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -2089,7 +2089,8 @@ static void ip_mr_forward(struct net *net, struct mr_table *mrt, } /* Wrong interface: drop packet and (maybe) send PIM assert. */ - if (rcu_access_pointer(mrt->vif_table[vif].dev) != dev) { + if (true_vifi < 0 || + rcu_access_pointer(mrt->vif_table[vif].dev) != dev) { if (rt_is_output_route(skb_rtable(skb))) { /* It is our own packet, looped back. * Very complicated situation... diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index a628acf50b0d8..af968a2c2a784 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -2225,7 +2225,8 @@ static void ip6_mr_forward(struct net *net, struct mr_table *mrt, /* * Wrong interface: drop packet and (maybe) send PIM assert. */ - if (rcu_access_pointer(mrt->vif_table[vif].dev) != dev) { + if (true_vifi < 0 || + rcu_access_pointer(mrt->vif_table[vif].dev) != dev) { atomic_long_inc(&c->_c.mfc_un.res.wrong_if); if (true_vifi >= 0 && READ_ONCE(mrt->mroute_do_assert) && -- 2.53.0