Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0DD243DA7FF for ; Sat, 8 Aug 2026 12:29:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786192158; cv=none; b=OVsvHoqVJ3H7pOaE08kkCKzPUZOpeWdcSBE9Frtt0cm9EuiiqOhMgRlznw8oLh2df16y+W1g+YdYyD6uWWkstlYeX+fqtMrdYAekzlzMgCzStEjOmaJAugwnn9gGkAZoym2ZF5opGKdX7wxgaKgcLKkYgDm7+YXuuYcXbKvc6QA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786192158; c=relaxed/simple; bh=snriT2gkTZwp3uh5iEO3vSu9qqopTyhv2WMb13QgMDk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O7AzqduBg4ZZr1hqa/MjLcwCeusf2q3vYL5tlkSpn27I4oZQSZ4t6+04CpIrlCachJC+p7eNhzkzKnTqlaGSAFtDn+LLcJiEXuJwHCpuBFxYa6yGGCsYKWYEVuIKWDVlwyt4m8uzGO02ehv5L8vvaUKlblCYuWkfAaB/h8IERaI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Iuifs6QN; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Iuifs6QN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 535431F00A3F; Sat, 8 Aug 2026 12:29:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1786192148; bh=+imq7TPi+oANxkO3LKMJuWwcIgjpRZh8Njy1pahT5qY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Iuifs6QNOT/W3nryxKjUTHMjtQqE+gPUzp3KXCwKlsdtkcgfXKMiA8Ovq758HIfjj /dtodYMOLnL08vLWJ/mIgDZQk1YyWtgZM/rrKj8mzZWkU89upujHX7YWMjQ+TgM7h3 WfsleUFv4+pF/VVM7ZNeM71q6AYFleiRwf/zvuZ48AmomeCLH8/tVd+N++De2MJd/M mWg2gxKCmzuQaLe0gt/TSFjFRjPAwekVXnlJmtIoRLZaN6/wGqW+kNkcwRGqxR7YZg t0MyL7uMRv7EmH2TC4ufvJMdbzy+v3zUHeQYLTMY/COQKo/NU3G/fIr6mQQMzuy0jN thLgnFZ+8ywxg== From: Sasha Levin To: stable@vger.kernel.org Cc: Shiming Cheng , Willem de Bruijn , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6.y 2/2] net: gro: fix double aggregation of flush-marked skbs Date: Sat, 8 Aug 2026 08:29:05 -0400 Message-ID: <20260808122905.253730-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260808122905.253730-1-sashal@kernel.org> References: <2026072946-scavenger-smelting-3d16@gregkh> <20260808122905.253730-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Shiming Cheng [ Upstream commit e751256486d0ded20f5a9f9863467f1dce65142f ] Commit 0ab03f353d36 ("net-gro: Fix GRO flush when receiving a GSO packet.") added a flush check to skb_gro_receive(), but skb_gro_receive_list() lacks the same validation. As a result, packets marked with NAPI_GRO_CB(skb)->flush may still be re-aggregated. This allows already-GRO'd packets with existing frag_list to be re-aggregated into a new GRO session, corrupting the frag_list chain structure. When skb_segment() attempts to unpack these malformed packets, it encounters invalid state and triggers a kernel panic. Scenario (Tethering/Device forwarding): 1. Driver: Generated aggregated packet P1 via LRO with frag_list 2. Dev A: Receives aggregated fraglist packet and flush flag set 3. Dev A: Re-enters GRO, skb_gro_receive_list() is called 4. Missing flush check allows re-aggregation despite flush flag 5. Frag_list chain becomes corrupted (loops or dangling refs) 6. Dev B: TX path calls skb_segment(), crashes on corrupted frag_list Root cause in skb_segment(): The check at line ~4891: if (hsize <= 0 && i >= nfrags && skb_headlen(list_skb) && (skb_headlen(list_skb) == len || sg)) { When frag_list is corrupted by double aggregation, when list_skb is a NULL pointer from skb->next, skb_headlen(list_skb) dereference NULL/corrupted pointers occurs. Call Trace: skb_headlen(NULL skb) skb_segment tcp_gso_segment tcp4_gso_segment inet_gso_segment skb_mac_gso_segment __skb_gso_segment skb_gso_segment validate_xmit_skb validate_xmit_skb_list sch_direct_xmit qdisc_restart __qdisc_run qdisc_run net_tx_action Fix: Add NAPI_GRO_CB(skb)->flush validation to the early-return check in skb_gro_receive_list(), matching the defensive programming pattern of skb_gro_receive(). Fixes: 3a1296a38d0c ("net: Support GRO/GSO fraglist chaining.") Cc: stable@vger.kernel.org Signed-off-by: Shiming Cheng Reviewed-by: Willem de Bruijn Link: https://patch.msgid.link/20260709014704.3625-1-shiming.cheng@mediatek.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/core/gro.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/core/gro.c b/net/core/gro.c index 616b34275e356..e9ed98dc628d8 100644 --- a/net/core/gro.c +++ b/net/core/gro.c @@ -232,7 +232,9 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb) int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb) { - if (unlikely(p->len + skb->len >= 65536)) + /* make sure to check flush flag and to not merge */ + if (unlikely(p->len + skb->len >= 65536 || + NAPI_GRO_CB(skb)->flush)) return -E2BIG; if (NAPI_GRO_CB(p)->last == p) -- 2.53.0