From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f177.google.com (mail-yw1-f177.google.com [209.85.128.177]) (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 D0B51432BE8 for ; Mon, 6 Jul 2026 16:36:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783355816; cv=none; b=E3AOfkTt5+D1A9wzcqwhOBfFSTzts/0drZvzKBTnE6yPwUyBVAspFnF2pS9tb0Q8mp0E51PE875nR2s0CorJXSNS5XyNSzAOnoXok9Rd0SdC2dTWCAWlPgPQ6u/SCuqz+Oakna2HC+3LFdAdrEl1g/TNkGIt6PKhyz8PAJoUorU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783355816; c=relaxed/simple; bh=Rq2wwkYTiUr3Hh85G7r77JXihYNgK7FBfHMZJMmDOgw=; h=Date:From:To:Cc:Message-ID:In-Reply-To:References:Subject: Mime-Version:Content-Type; b=Fm8B12Aby2ZYqMGFRCurdMSEsvgpT2/bdTIzF3JUVkg8Fc+ISYZdTrK5xl8EnqwtnLTw7z+en3rUsPhcPfsN5gflPOBpXMLS8NCbmm/YFaFlwIyylQL2zO2Y5JiTbW/9iSdlC9LfCensI4WsV3QcOkyjqyYyFhuFECYus42Vz+I= 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=V4X877jB; arc=none smtp.client-ip=209.85.128.177 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="V4X877jB" Received: by mail-yw1-f177.google.com with SMTP id 00721157ae682-8143d904b01so34534687b3.3 for ; Mon, 06 Jul 2026 09:36:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783355813; x=1783960613; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:subject :references:in-reply-to:message-id:cc:to:from:date:from:to:cc :subject:date:message-id:reply-to:content-type; bh=0pJcWvIhqLuJxPO4aE4cyY/xCREGxJtBF+FRAD54hro=; b=V4X877jBA9oDVQfacZTHh6TmZK3jJb0jUWyEPTuOKLpq+ELFkbFePRD98+hhojR5kL s9XkPqndgB4AqsaztKYHkFrg7Q+rvIOYa6CBwYpqduAbYwauX9TB7dPjsNUYhwD2XrMz GIMijs/flIefi7urgK/1KKVqQ4SD6C7A2zpLZnOQrAXtYshud5kFACcGvd1/vwbMUN+Y xGlyY0ToXXN9EZamR1giZj5FLOzY/Ry/TYPjPf+6u5xMrMld432ZXpKcmT2crC6p8O2o PxOpQLtmDglTb83OtDo7XTC2ERQpBYiLjXEqpFkwzNV+uAe+xSKbV4WTpSdsBc9Sz14f /ufA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783355813; x=1783960613; h=content-transfer-encoding:content-type: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 :content-type; bh=0pJcWvIhqLuJxPO4aE4cyY/xCREGxJtBF+FRAD54hro=; b=GFIGESbUNwYdCUx4DeUhDVE1eOw4e1IZUTYh9If5IX5BZNZJsE97Gpo+TcZPv4y4hW 7hSQatLS8UbpFjBRzM+LgTlLBQiKtOwXvp9mW1pHJXkurMvzPDngi6vUa2ei0L4WkW7f 41YombqGmsxvRDzcQFpM061L2QiQJn/TODHcLRJLFt31C2I2sfeXNBmGSEJtXQr9y7g9 2HwVs78WOuAJhjmQwGPkmllU7oj9ccKJTC32eE2zLbJwnrA7f688nse/RsSMranuBrx6 EKxvowArmH/Y/4A1elVkGQI+1OGY+hw9Rd+vmqjo4AE6dJIJCYv7Zh8d6BY3IAl/XAHa pCjQ== X-Forwarded-Encrypted: i=1; AHgh+RqBToYWIhJVPwHpvA/Xn/MEyhVXwCZ+v18QZ0LZLAcAK/btpYJzGfCrQbOSFqp4HBKQ9ccZXowMrpHZ1Y4=@vger.kernel.org X-Gm-Message-State: AOJu0YyZUvy33Y9z5J5N6YxnRt6uQyhIAkjmnupZZqxpkKfd1mggyK8b eFJQQOpf38cSoeSgViR5tVDsiF/kEMVPtl8RPTgnsgjXHNWNdZiB2/gf X-Gm-Gg: AfdE7cnYlPG91xBup46fVvv3VPC/1u1/hA5NV4ahoqAEswOC0sFdljWiYPRlfunC7T8 vuEGbwAqpf/qRFNG7kGBn5MXtrTSnnxgG6wHr6b+133f/dDuXlpmmjkiLdZd8M9dtiIPaO01Lnx AcEuoGympPAgOO13xWgqNDER2Fj4xPsG40AHs7hlCULiJ3HIwboom9GW2w5SPmOhiVi4gloPROC jnNHOzpUZFTNjlCT7jFnEe6vEfyPyX5S1RWl9dLbUkAuavYtzBdW9byxLgWIauhB6KlQoz9Y7Eg Jdqu0m/HR+geDlLpau+4nIjTVmQ+n0Kgn/92tjbGTMXPyUXPvgTy4rQ6ihKBjVnxY6JOa3c91P1 Ol/W7YAPRH3nes1TEhy9qHYUrtdJMeoIRea1Pm2kuetmpKgnoqfRMcqV4ZiBmWcm+L4car49Qqh myX+CPV601KTX6MUMA06xIanwAUUFnMQ3W1Hmwimrk1Pn4ZsqmsLcz13wJsLQMqyqgYA== X-Received: by 2002:a05:690c:ed6:b0:80c:85e5:8750 with SMTP id 00721157ae682-81be33a3727mr8097857b3.57.1783355812853; Mon, 06 Jul 2026 09:36:52 -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-8144bd26ebfsm59805817b3.48.2026.07.06.09.36.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 09:36:52 -0700 (PDT) Date: Mon, 06 Jul 2026 12:36:51 -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, steffen.klassert@secunet.com Cc: stable@vger.kernel.org, lena.wang@mediatek.com, shiming.cheng@mediatek.com Message-ID: In-Reply-To: <20260706034611.360-1-shiming.cheng@mediatek.com> References: <20260706034611.360-1-shiming.cheng@mediatek.com> Subject: Re: [PATCH v5] net: gro: fix double aggregation of flush-marked skbs Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit [PATCH net v5] 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 In v3 I requested referring to the commit that fixed this in skb_gro_receive: commit 0ab03f353d36 ("net-gro: Fix GRO flush when receiving a GSO packet."). That explains the issue well. > > 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 | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/net/core/gro.c b/net/core/gro.c > index 35f2f708f010..b1573d98f3a5 100644 > --- a/net/core/gro.c > +++ b/net/core/gro.c > @@ -229,7 +229,14 @@ 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)) > + /* > + * Packets marked with NAPI_GRO_CB(skb)->flush have already gone > + * through GRO/LRO processing and must not be aggregated again. > + * Re-entering frag_list GRO may corrupt the frag_list chain and > + * later crash during GSO segmentaiont. > + */ Such a verbose comment is not needed. Code would be overwhelmed by comments if done everywhere. > + 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 >