[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: [PATCH net-next v2 10/10] net: skbuff: don't reset truesize in skb_condense() if the pull fails
- To: Josef Bacik <josef@xxxxxxxxxxxxxx>, Jakub Kicinski <kuba@xxxxxxxxxx>, Paolo Abeni <pabeni@xxxxxxxxxx>, Eric Dumazet <edumazet@xxxxxxxxxx>, "David S. Miller" <davem@xxxxxxxxxxxxx>, Andrew Lunn <andrew+netdev@xxxxxxx>
- From: "Loktionov, Aleksandr" <aleksandr.loktionov@xxxxxxxxx>
- Date: Wed, 14 Oct 2026 10:44:04 +0000
- Accept-language: en-US
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oQzRNnK5vwyyQeKvdyHpRRup8MZ7y+Sp/h2zbPxwwgw=; b=r1IxJFVJNOkVLAWWosFbHwdSsgUh7BJfAqn8N8NryWskzEsQbSJJO7/LZwXhRMbY7KfRKRLgzAF1zRBG3Y3esAAIHwE2hzV5MBFAsjTh6iy3hx0jQUqJMp3mumf0nFvh8h/7vL7gtvP+It8UrfTHeUhVpyJ0CdBr+kcR5hibi8vHFXDeIYYM44VpmQll1sc6tItWt90wvpBVBkvLpy1e5hiynJDnSZhCJn/F6/ZhyGoh1T6s5CvXXO73kQ1YOzkCNHzTItSBckI8S1z4b3d8bE7P7gXn4pgxGPjewScDWGVmK0ZNs1r9yAeWBAmk0ZKumb6B/0eewouk5hX+X7/Q0w==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jHWu3wxewyIRfdfrrjQZnhd0ls4DiKXA4xMSz73oUh8630F5LuMm1QlOrVtaMcfxtQ/TSPhFRIqWvtRzxFpPYjzXV1CDSVdlKWeii6/uGWhdA1RKG4/m2Ce782FoVPoAAb+f1PekwojvVGzg3Bcy6WbtMZX3dfbFNcl0oHMJs7zmjNHs+VZF5VvZbBPZwzENJEiLr88meCQI/8DsGtoTrTc0ngsFzmNo2jCuuipMRSekhdrkbnuqXxCFtJVWxJM67ojPVjw5A5UkY2VPgNoAD7ykbWZyEx4V/VfduSO5AvZtnEkU8brYbKlIytKkzOfFRQ3qZGpWDSvMQA0KFlARxw==
- Authentication-results: eu.smtp.expurgate.cloud; dkim=pass header.s=Intel header.d=intel.com header.i="@intel.com" header.h="From:To:CC:Subject:Date:Message-ID:References:In-Reply-To:Content-Transfer-Encoding:MIME-Version"
- Authentication-results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com;
- Cc: Saeed Mahameed <saeedm@xxxxxxxxxx>, Tariq Toukan <tariqt@xxxxxxxxxx>, Mark Bloch <mbloch@xxxxxxxxxx>, Leon Romanovsky <leon@xxxxxxxxxx>, "Juergen Gross" <jgross@xxxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Oleksandr Tyshchenko <oleksandr_tyshchenko@xxxxxxxx>, "Nguyen, Anthony L" <anthony.l.nguyen@xxxxxxxxx>, "Kitszel, Przemyslaw" <przemyslaw.kitszel@xxxxxxxxx>, Manish Chopra <manishc@xxxxxxxxxxx>, "Rahul Verma" <rahulv@xxxxxxxxxxx>, "GR-Linux-NIC-Dev@xxxxxxxxxxx" <GR-Linux-NIC-Dev@xxxxxxxxxxx>, Shahed Shaikh <shshaikh@xxxxxxxxxxx>, "Simon Horman" <horms@xxxxxxxxxx>, "netdev@xxxxxxxxxxxxxxx" <netdev@xxxxxxxxxxxxxxx>, "linux-kernel@xxxxxxxxxxxxxxx" <linux-kernel@xxxxxxxxxxxxxxx>, "linux-rdma@xxxxxxxxxxxxxxx" <linux-rdma@xxxxxxxxxxxxxxx>, "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>, "intel-wired-lan@xxxxxxxxxxxxxxxx" <intel-wired-lan@xxxxxxxxxxxxxxxx>
- Delivery-date: Thu, 15 Oct 2026 12:02:04 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
- Thread-index: AQHdV2iQSwkJ8X/q3kW4y1x3MSmxj7b84vew
- Thread-topic: [PATCH net-next v2 10/10] net: skbuff: don't reset truesize in skb_condense() if the pull fails
> -----Original Message-----
> From: Josef Bacik <josef@xxxxxxxxxxxxxx>
> Sent: Thursday, October 8, 2026 11:03 PM
> To: Jakub Kicinski <kuba@xxxxxxxxxx>; Paolo Abeni <pabeni@xxxxxxxxxx>;
> Eric Dumazet <edumazet@xxxxxxxxxx>; David S. Miller
> <davem@xxxxxxxxxxxxx>; Andrew Lunn <andrew+netdev@xxxxxxx>
> Cc: Saeed Mahameed <saeedm@xxxxxxxxxx>; Tariq Toukan
> <tariqt@xxxxxxxxxx>; Mark Bloch <mbloch@xxxxxxxxxx>; Leon Romanovsky
> <leon@xxxxxxxxxx>; Juergen Gross <jgross@xxxxxxxx>; Stefano Stabellini
> <sstabellini@xxxxxxxxxx>; Oleksandr Tyshchenko
> <oleksandr_tyshchenko@xxxxxxxx>; Nguyen, Anthony L
> <anthony.l.nguyen@xxxxxxxxx>; Kitszel, Przemyslaw
> <przemyslaw.kitszel@xxxxxxxxx>; Manish Chopra <manishc@xxxxxxxxxxx>;
> Rahul Verma <rahulv@xxxxxxxxxxx>; GR-Linux-NIC-Dev@xxxxxxxxxxx; Shahed
> Shaikh <shshaikh@xxxxxxxxxxx>; Simon Horman <horms@xxxxxxxxxx>;
> netdev@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; linux-
> rdma@xxxxxxxxxxxxxxx; xen-devel@xxxxxxxxxxxxxxxxxxxx; intel-wired-
> lan@xxxxxxxxxxxxxxxx; Josef Bacik <josef@xxxxxxxxxxxxxx>
> Subject: [PATCH net-next v2 10/10] net: skbuff: don't reset truesize in
> skb_condense() if the pull fails
>
> skb_condense() pulls all of the frag data into the head and then sets
> truesize to cover just the head, but it ignores the return value of
> __pskb_pull_tail(). If the pull failed, the frags would still be
> attached and truesize would undercount them.
>
> It can't fail today. The caller has checked that the head has room,
> that the skb isn't cloned and that the frags are readable, and pulling
> all of data_len eats every frag_list skb whole, so nothing is allocated.
> Check the result anyway and leave the skb alone on failure, so this
> stays correct if any of that changes. Use __skb_linearize(), which is
> what this pull is.
>
> Assisted-by: LLM
> Signed-off-by: Josef Bacik <josef@xxxxxxxxxxxxxx>
> ---
> net/core/skbuff.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/core/skbuff.c b/net/core/skbuff.c index
> f798118df112..556d37981f0f 100644
> --- a/net/core/skbuff.c
> +++ b/net/core/skbuff.c
> @@ -7158,7 +7158,8 @@ void skb_condense(struct sk_buff *skb)
> return;
>
> /* Nice, we can free page frag(s) right now */
> - __pskb_pull_tail(skb, skb->data_len);
> + if (__skb_linearize(skb))
> + return;
> }
> /* At this point, skb->truesize might be over estimated,
> * because skb had a fragment, and fragments do not tell
>
> --
> 2.55.0
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@xxxxxxxxx>
|