From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) (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 42D1444A3FC for ; Thu, 8 Oct 2026 21:03:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791493426; cv=none; b=qd1ZEzmgM1PBvxmE7Qd+k/OA5+IQItX2vxfSYYkyhGYJADpIhXV0XfYlSALeoj5RFBA0NNwfZeI/hU54rfGNZqWp6UUXqwtnns3x08FJYRcQidmp5eBz9PIxyvhYWsnYCAW4TNBkaW1seokZMWCywA2C7nFdXj+WiKwUpgvEN60= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791493426; c=relaxed/simple; bh=2XY23bjEEEbmilzyi/OT0dLNP6D+zOB3zspYb8/aVZ4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Cyf//nLpx7qgZSTe7lG6Tl9dBPI2In3/YUTZ/Jio94S84rwM9tVZRlatZUwmiHUxy+8fEa+5G2ZOtWetu+6ntmITd15KZRoo0Q9Nof42TTbeWVCBYe3f82XYhrjRMW19NjuRzVKSF61+O4BLQsOtbSj2pxvPwHxCFX3byFKlBls= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=toxicpanda.com; spf=pass smtp.mailfrom=toxicpanda.com; dkim=pass (2048-bit key) header.d=toxicpanda.com header.i=@toxicpanda.com header.b=iJe9mSuI; arc=none smtp.client-ip=209.85.160.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=toxicpanda.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=toxicpanda.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=toxicpanda.com header.i=@toxicpanda.com header.b="iJe9mSuI" Received: by mail-qt1-f174.google.com with SMTP id d75a77b69052e-53504882980so48852311cf.2 for ; Thu, 08 Oct 2026 14:03:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda.com; s=google; t=1791493418; x=1792098218; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=pgpiLoGoqA0xV5yWN2rO1XVw1oOPWsG2lgMDpzrz1ts=; b=iJe9mSuI+Cqf6SYJ3kO6iDzcVJ1nbec3USAXCzXLrFkPle9Yjxm1g6soBsr0vfersx 6kg5IecuO31dQO2C5BZnNV7FOnAYUJ05unx+pxsJc8PTDVQU+FZHuLlAkuA4f4mvrZF7 a2SdfFxB3aT66a6YWor0vVok3TviBJtr2WMgugbR3lUVbNlCWifig/Ic5pYAISCvGFs7 OD8/QS5yL7WFhnDeO8jUoC6swIZbyMmcOQiZRAZkaPXNrRuqSpEqFdhjctwkUdQS/KEj wwp5rGu1cMI7UABeyGv/QTgTePsLf0ufzfWpPvFF8O1X7WPVtnjGnPNpuleeGR9dkIu2 /WHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791493418; x=1792098218; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=pgpiLoGoqA0xV5yWN2rO1XVw1oOPWsG2lgMDpzrz1ts=; b=OuK91F7SNF+CPbcFDrB1Co2FAE0mTAl7HokBeR4CdxTj/kBvZ/b7jWLXzI+cp2T6S1 zLltOaG8ZXHT7cGGId9KeKfSUFIX95Slu9M+GzbAQPr8rrAu7cyHCjroa3c31VYx6CZk HIjhrwfCRGKThz+YUMhiYJT6uUXzv55u7QiV6cnFesbMYmIqcERB9b0rQrBtL913gZAC 3omK+iQ+gkc4/m69mInTZhMWhSeHyhLT/PueiYHaIjfXwjnhFOj71gFZMKVLcQbxt/N6 zrgKYPHJtW6jLqTaks+BFfs9mrPBoEaFk5/GKRrGN99ruj8y/VTDd00p/dIMQZv3GHog 5zgg== X-Forwarded-Encrypted: i=1; AKwUvByc/OFVJ4vtdZwWmYCo+VraTSRaodwVupOM6BAMh2GgJFv2Ku74bft9YbDA2BrjkcfDp0TXsyU=@vger.kernel.org X-Gm-Message-State: AFuF++mYYGQ/EhpIk6MKFcr8BFiXCXfQSz/XYV6/xGN8SrDb8/LzaELX 5TIyDrEIYo7XsyRRt4AO3hvt2UnSYo2Isks5BLFNbNM50D+YyxOe7Y6IjvGJ8Ftp+GM= X-Gm-Gg: AYBFou2DWAICTIC3n3av1uFROWYJbdWsrfTIAP8/kcT7kVKIJ6YeHUykN0yUnipx3j2 uRAMlLlZdU/23UVMqblqxXcaYiuNPPlD7rRVLBADjjQK8i3U1I7Fxl1S9NSIAe0ttgsiBAANulm G2d42v9o70TQGD8aE80FjKy63FqD2uRJZd8D/XDCTUdwgI9FV/S+FTVCXBo4bgfavLZ15KgseQ1 3JAB+V4CdUULwQcprFpSPu7Nx+6TsFnd+oePuowI+IMkye22GHQqpxIOaA7uzhZHlLWLQt2E+JI z3Wy2qMdFGcef8tLkWztRH0sYbDw4WiGdL0cPONaCqpR4v+9NYT323hDDzFi4bRID5QDphzphkL kekf2Rajhl5UilU8vMH8rHRiJRb9FbokahozMjA0vLlPWUEwrIiT5XW/G2Swrf4lNtscDfB//sG gUUZ+Bka8Y9W5tPZv6WildkEK/mM6IuNB7XMPqVbSnTAWS6LBaPzZuJVU4D7p9lBAyIir3ewGKF e1euTEpJL+XXvk= X-Received: by 2002:a05:622a:90a:b0:530:e52a:8ef0 with SMTP id d75a77b69052e-535754fe4e9mr117963541cf.26.1791493418024; Thu, 08 Oct 2026 14:03:38 -0700 (PDT) Received: from toxicpanda.com ([153.61.196.248]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-5359b7ecccdsm3179791cf.30.2026.10.08.14.03.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2026 14:03:37 -0700 (PDT) From: Josef Bacik Date: Thu, 08 Oct 2026 21:02:54 +0000 Subject: [PATCH net-next v2 07/10] e1000e: use pskb_may_pull() in the 82571/2/3 TSO workaround 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 Message-Id: <20261008-b4-pskb-pull-tail-drivers-v2-7-8f2bd9bee138@toxicpanda.com> References: <20261008-b4-pskb-pull-tail-drivers-v2-0-8f2bd9bee138@toxicpanda.com> In-Reply-To: <20261008-b4-pskb-pull-tail-drivers-v2-0-8f2bd9bee138@toxicpanda.com> To: Jakub Kicinski , Paolo Abeni , Eric Dumazet , "David S. Miller" , Andrew Lunn Cc: Saeed Mahameed , Tariq Toukan , Mark Bloch , Leon Romanovsky , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Tony Nguyen , Przemek Kitszel , Manish Chopra , Rahul Verma , GR-Linux-NIC-Dev@marvell.com, Shahed Shaikh , Simon Horman , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, xen-devel@lists.xenproject.org, intel-wired-lan@lists.osuosl.org, Josef Bacik X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openssh-sha256; t=1791493385; l=1188; i=josef@toxicpanda.com; h=from:subject:message-id; bh=2XY23bjEEEbmilzyi/OT0dLNP6D+zOB3zspYb8/aVZ4=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgUBr36M/n0nWN0DNbnxwzIiCZez6MG JiruuNaSCI/zXsAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QAo/dBnlSZS1Mj/EC08Jadkujj6NZVKDZ6T6FMxXeYq/Bm8xNWGafGFpWL2jadSBYVOawvF0VKq O0PAtfO9A+w0= X-Developer-Key: i=josef@toxicpanda.com; a=openssh; fpr=SHA256:C8kOX2QUJCMqnCX+KEeoqRAjLo9L+ELOSH2NSAJHqGA e1000_xmit_frame() uses __pskb_pull_tail() to pull up to 4 bytes of payload into the head when the head holds only the TSO headers. It already checks the result. Switch to pskb_may_pull(), which takes the length the head should end up with and checks it against the skb, so this driver no longer calls __pskb_pull_tail() directly. Assisted-by: LLM Signed-off-by: Josef Bacik --- drivers/net/ethernet/intel/e1000e/netdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 844f31ab37ad..e216868e15cb 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -5859,8 +5859,8 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, unsigned int pull_size; pull_size = min_t(unsigned int, 4, skb->data_len); - if (!__pskb_pull_tail(skb, pull_size)) { - e_err("__pskb_pull_tail failed.\n"); + if (!pskb_may_pull(skb, len + pull_size)) { + e_err("pskb_may_pull failed.\n"); dev_kfree_skb_any(skb); return NETDEV_TX_OK; } -- 2.55.0