From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yx1-f53.google.com (mail-yx1-f53.google.com [74.125.224.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 59A8B34B697 for ; Tue, 7 Jul 2026 15:17:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783437421; cv=none; b=hFGdVSiNvoR/Lh1qWKj/LEbDuAXeyVL0VYdB4UHnloHp/Y2GkYZiQSdC/VfQGmie78kP4qjWMh4ciPp07rL+e25s8vj5FFRHSs3WWlOqz1iqTLoiSXgn1EKSkKxXJ0zgDZCkQ2bVlitg5YBpUa1tPhzkWNQUn5YgNqCmX2Ok9ho= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783437421; c=relaxed/simple; bh=6n8aPA1vZTHKTUYfm4zIRDmO2S0R8XGdy/C7T/5N6B8=; h=Date:From:To:Cc:Message-ID:In-Reply-To:References:Subject: Mime-Version:Content-Type; b=eblDyWTljI4PWSEf9LTOlIXp1tTQSRrVuPKc/S2Lr18zapZ4zdcKvZXDA33D41ueREpwIRr+bN4sZVoqKdWC5Q5lHbG2rk1HHdx6wDyQmEcXxXVyzrkWQShYLZ6HV3xsIvAOSLOIK7ke+p8qdrhCCHnEml+LvHPAa1d1FQYsx/o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=iGpe+Gu/; arc=none smtp.client-ip=74.125.224.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iGpe+Gu/" Received: by mail-yx1-f53.google.com with SMTP id 956f58d0204a3-664db84f074so4918583d50.0 for ; Tue, 07 Jul 2026 08:17:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783437419; x=1784042219; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=E+LREjqj7QKR0h0vN+5yo9g4950/7tRNrphjJDSrz5U=; b=iGpe+Gu/YT46RFsRLmyqO4SBPuyruiSVpO2SMnBWzewOPAqo7M1FDFh8yaMK7l9/Y/ DsfkAOGU5NA5Khc/I3lYs6aoR1Ctkwbm0yEXRY82tLqQJtuJK7ExSATbKBfBMqwTOPk7 LxZfBGUOvw+HL3RjFX6A3QsB7LmvI3xpB+H6QKJAl61KwWv4DEstRaRrC1a0i50fiZJg ifUALnhmB99GXGW0K3AGuuhy9waFdXFosfOGif/GkwIvzc4dtKhpUWOQYkTDnXJfPeWq AqaaEMba53OVHE8kvJV9/U0ibI1ownVwNWzPXuOAs5lc2IfeRQ0rIuRQExoIfbLP/a1I qXwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783437419; x=1784042219; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=E+LREjqj7QKR0h0vN+5yo9g4950/7tRNrphjJDSrz5U=; b=pEy8gI0DwcNx1zUcM3uZq+RU2rxh9zr+k76mBzVwb4guZTv7f7kDqDWvdw4RR7sdYP wf/CJ5FsQIdBSR2seK5zhYySoprkyniHdRxyDDCETyiuDIURACWXdJcVYIGvzQUjI/zQ okxbNMHgJJ3b0omAfj9sEhfYCfyzvTYczEp74vwMHhwvcU5r/WCQx1irt9DVh1iHXV0H xFuH1T2YjWpDsCys0XFCIglG1MqSwAYoUmarhWaTHavrzIY26bRNPBCtUEXWIVY0LO8K CzoZUMaLz2RC6ybKVotpXB64ZXacW03GbMaT7jGxCb/XhPbAqKR6eFi5K0CdUkDEremW U+IA== X-Forwarded-Encrypted: i=1; AHgh+RpgXEHU4Y9Fkxz/tjaYK0cc42KMOTUKX9FIx3KNYi3n/ikRZ3PLqTDVlXEk6VZ9/hWl7YdZPSc=@vger.kernel.org X-Gm-Message-State: AOJu0YwEs3HX1dLFYJXPTTZKbLVfrOyBGrq+yLccqXGSCKVjbqqVTGyT sEE4Y4RTg6r0PN+lxHcD+qYBo+FSByiIexVP/hv3WCkiRxN8hlE9Acg/ X-Gm-Gg: AfdE7ckAzcnHOccJFwrT1DaGP04EZvXVohAV1TXIeQHTNeOhP965YO+S9TsrcXT8209 NrBLMgBCXgnYcT7PzqN7gPkvoXP/VEx6zLGAV4M1kz/9OzNlfqY6g3j+ypcmaA2EflmU9gguH5A IIM9a+Ae6AbbxR316p1CN99L6t9prYwXziztdv3B1K0IwhdVFqD+wCGTzJHfX/Oug+B/UhwVwfv 4Dcvfg5p5bJqCaOEMd+Uqa2gcR8tHzJKnChkLXTmrpGtsmUr2XzEBKtGt8qQNtfFr+nIhHlWxhd ugYI4Y+P6mQbMqot4pa0flWvOApS6KuDhxKiLC6lXpT4e7mcfGBzbKh6SG5ot4o9XFawtO+Yz50 PtuxRD6R0wgppZAX0eCjDcUVC7GxIC0q6ieYzfTuX+m6VJ5y5AQRhOv1ezTvK+p9NnKtoV1O3bp 3++c3Um7WFbU2GUVuqsH6vQ+NpalMYWbb+kgHi2nUC8m2nZN8BDRtBF2+Qa6FkMZ2yfw== X-Received: by 2002:a05:690e:1189:b0:667:8dc9:2321 with SMTP id 956f58d0204a3-6678dc92498mr1718562d50.29.1783437419315; Tue, 07 Jul 2026 08:16:59 -0700 (PDT) Received: from gmail.com (172.235.85.34.bc.googleusercontent.com. [34.85.235.172]) by smtp.gmail.com with ESMTPSA id 00721157ae682-8144b049939sm70583417b3.32.2026.07.07.08.16.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2026 08:16:58 -0700 (PDT) Date: Tue, 07 Jul 2026 11:16:57 -0400 From: Willem de Bruijn To: Shiming Cheng , davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, willemb@google.com, daniel.zahka@gmail.com, alice@isovalent.com, sd@queasysnail.net, eilaimemedsnaimel@gmail.com, imv4bel@gmail.com, nbd@nbd.name, dsahern@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: stable@vger.kernel.org, steffen.klassert@secunet.com, lena.wang@mediatek.com, shiming.cheng@mediatek.com Message-ID: In-Reply-To: <20260707021425.483-1-shiming.cheng@mediatek.com> References: <20260707021425.483-1-shiming.cheng@mediatek.com> Subject: Re: [PATCH v6] net: gro: fix double aggregation of flush-marked skbs Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Shiming Cheng wrote: > The skb_gro_receive_list() function is missing a critical safety check > that exists in the skb_gro_receive() implementation. Specifically, it > does not validate NAPI_GRO_CB(skb)->flush before allowing packet > aggregation, as of commit 0ab03f353d36 ("net-gro: Fix GRO flush > when receiving a GSO packet."). It does not check .. as of commit .. ? No, skb_gro_receive checkos NAP_GRO_CB(skb)->flush as of that commit. > 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 > --- > 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 35f2f708f010..b413f4a6462b 100644 > --- a/net/core/gro.c > +++ b/net/core/gro.c > @@ -229,7 +229,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 (!pskb_may_pull(skb, skb_gro_offset(skb))) { > -- > 2.45.2 >