Received-SPF: pass (google.com: domain of linux-kernel+bounces-171201-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Suman Ghosh <sumang@marvell.com>
To: Felix Fietkau <nbd@nbd.name>,
        "netdev@vger.kernel.org"
	<netdev@vger.kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        "David S.
 Miller" <davem@davemloft.net>,
        David Ahern <dsahern@kernel.org>, Jakub
 Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Willem de Bruijn
	<willemb@google.com>
CC: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [EXTERNAL] [PATCH net-next] net: add missing check for TCP
 fraglist GRO
Thread-Topic: [EXTERNAL] [PATCH net-next] net: add missing check for TCP
 fraglist GRO
Thread-Index: AQHaoGPJEB2DdFr3+UCCiAc99tDRbLGLo4vA
Date: Tue, 7 May 2024 11:33:16 +0000
Message-ID: 
 <SJ0PR18MB521604310B1F7DC297C2870DDBE42@SJ0PR18MB5216.namprd18.prod.outlook.com>
References: <20240507094114.67716-1-nbd@nbd.name>
In-Reply-To: <20240507094114.67716-1-nbd@nbd.name>
Accept-Language: en-IN, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: 
 =?us-ascii?Q?Bcm3GZwjt+Xej5pc+nn4Tpxuw96+SUjJ5wv9NdJfFh2IKD8oJC0KWWA1QOdO?=
 =?us-ascii?Q?UcHmY7hesISKmovDue5GFmoRfiVIQcsaM+1bHNdoLkj7NCLYWkbsI81ZBkFD?=
 =?us-ascii?Q?TX39mqXtCu2VrnEDBBvXlaxYdd0/bcrwbKd+iGGtHyYuv80SJ5VpdN+zs13u?=
 =?us-ascii?Q?a8/kgUj1vqREJ54mAkB71iiDYYRkWlVkAnsVRXhGFRTPryx8wKqaE0CQcuKJ?=
 =?us-ascii?Q?ge6HVQQ+Ak3BeLd2pbwfULe17MM+Tp7xz58LB/woXCgpVNz07Zts/O+jmWAY?=
 =?us-ascii?Q?pb+0gzM7l5WEV4C3paTkK35u57MGBqxA+T7KGTOCtDcBArYTWctla7EuyIcL?=
 =?us-ascii?Q?i1pQMsQw4iJIjwaJ3EUVSpjpFomE9r2jCffI1l6Y2ja4zp+TMuWeHErbRRJJ?=
 =?us-ascii?Q?KmdDr+OQuHSw1EjBSz/3sKsTOwHKqAvWiI2t0+ir15clcCN+T2dvoIHoDka9?=
 =?us-ascii?Q?VyTnM00lusJCnroHXpFhG5knUlJZ9y22r6hnE7I6gWaJ0INQl5uDLv6+qvg2?=
 =?us-ascii?Q?C7P9ScaNmXSpXF8RbzcbnXbew5Dxshu/O007rNnyiINeI/xolgEXETPo1u11?=
 =?us-ascii?Q?1UN5K3i8eCAaAHqSVZYzVCspiFZTXeAfOcUkr3nOBU86OFhEssGA+FjA8ryP?=
 =?us-ascii?Q?ppUQkrdveTTFig20zBfM+Mxtms15Hert6q++c2hGvuxVtNYk3/OjI3a/f92A?=
 =?us-ascii?Q?4sRJN/z209hPvtd1jvDKbUt20//JAw56wjrXWB89Uhjx4Bm0zM3Gyha5mHVA?=
 =?us-ascii?Q?5yGgIdJZLzl7YP3hbAzUPWnPEwj5nKgAQwAWL6jutqEdkJ1dKJwPK2S0Frj4?=
 =?us-ascii?Q?RRMpLvBtQpM8oQL1B+GXDVt6p11lIBnQSVkQL9nD4Cn3OI2/E6iwYZGH9gDy?=
 =?us-ascii?Q?eMond2ugp1PWsFmF1c1wztRg+nTDFv5PGNVTncSFO+Jm5X8bidcofPIPRJ/g?=
 =?us-ascii?Q?VfEgsnBDUtw1io9xH1HMfNJyWLAOnf1U5NJZz1ftuvt+W8KU6n7UGYmFT9vO?=
 =?us-ascii?Q?vDzmVhKvb8oyYUUi9gcBVKJHpp++HrWbeelB6V16W7tBjzqZBOYZ5Ur75nqv?=
 =?us-ascii?Q?D1gWEAQjAvseUdVGC9sKuQbhIo2PeUS/sHjsRytif6hK+pW46hiDUX8rsleL?=
 =?us-ascii?Q?2YF1b6y9fgBDK4Q5zEubddtM9lYWb0nWTZZdTAPe6uRIS/g71DVCK6y/dKmn?=
 =?us-ascii?Q?XoWw11dqabhVNOqLMD2Q00qF5FmlhZ6aJJHL60tzX9d5aKH+jX6ywVPdedqm?=
 =?us-ascii?Q?7AwY9+9x26VIl/cTVFXsMCHWZMg4DEoGNQLUwMpMRwSXu2jcg9maKM4JyhwE?=
 =?us-ascii?Q?pJmlGYxf+I9OsShPAouUT56aw/qFP/o5lzcLOQtMedwv1FoTrbqFh1aveQHr?=
 =?us-ascii?Q?ERCBCaU5xdjsVQddbEXvNf4HDEVHJZ70bKtf5mwNPO5OfkX1Rzwfr7leFdL4?=
 =?us-ascii?Q?acwap3lPGbdaoimfl4vwdArmAJf93xPDBxPGK4WU+U/r7k6mfo6vagf0/Ugc?=
 =?us-ascii?Q?FJPlUQVENs26Junz5qr1I49bPB9F/3LdwY9XTtO/Y6n2Y2GwRCnsw15mYsUV?=
 =?us-ascii?Q?o7Cjjvr5GwLyVaMHGSWreI3BnROV1dSb4X4o3BxM?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-OriginatorOrg: marvell.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR18MB5216.namprd18.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ae34a1c4-203d-4cfe-f7a8-08dc6e897d27
X-MS-Exchange-CrossTenant-originalarrivaltime: 07 May 2024 11:33:16.9083
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: q+oyStDZ2FJGaOFIL1q66Y8ML+EsXco+phWqoxH1Fw9lijVYD8tGR0dM5DnURA0RHPoypqYgsZLLYc/wQuD+pA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR18MB4265
X-Proofpoint-ORIG-GUID: t27bbFJKUGlZFrFFFEHQGUMaPgYhGYkG
X-Proofpoint-GUID: t27bbFJKUGlZFrFFFEHQGUMaPgYhGYkG
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26
 definitions=2024-05-07_05,2024-05-06_02,2023-05-22_02

>----------------------------------------------------------------------
>It turns out that the existing checks do not guarantee that the skb can be
>pulled up to the GRO offset. When using the usb r8152 network driver with
>GRO fraglist, the BUG() in __skb_pull is often triggered.
>Fix the crash by adding the missing check.
>
>Fixes: 8d95dc474f85 ("net: add code for TCP fraglist GRO")
[Suman] Since this is a fix, this should be pushed to "net".
>Signed-off-by: Felix Fietkau <nbd@nbd.name>
>---
> net/ipv4/tcp_offload.c | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/net/ipv4/tcp_offload.c b/net/ipv4/tcp_offload.c index
>c90704befd7b..a71d2e623f0c 100644
>--- a/net/ipv4/tcp_offload.c
>+++ b/net/ipv4/tcp_offload.c
>@@ -353,6 +353,7 @@ struct sk_buff *tcp_gro_receive(struct list_head *head=
,
>struct sk_buff *skb,
> 		flush |=3D (__force int)(flags ^ tcp_flag_word(th2));
> 		flush |=3D skb->ip_summed !=3D p->ip_summed;
> 		flush |=3D skb->csum_level !=3D p->csum_level;
>+		flush |=3D !pskb_may_pull(skb, skb_gro_offset(skb));
> 		flush |=3D NAPI_GRO_CB(p)->count >=3D 64;
>
> 		if (flush || skb_gro_receive_list(p, skb))
>--
>2.44.0
>