From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (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 B80FC439F9C for ; Thu, 8 Oct 2026 21:03:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791493423; cv=none; b=LsSgcAnq0sgV3+zQq4YSQGveWmHfXQolrrovbEg1eYr7Bfz0n/x3BbffJR/ICNmUcISkj1BF03MzA6U6oMeaFTLg45fybV8HVMQtqT7Spwvmv3R6n7yic0BvDuuUo3WT0iFUFkP3WRECvmrrRSZbhuxZJN6fJFhK3MadcIMUc7E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791493423; c=relaxed/simple; bh=yldyXc+k9IUGHFBVvbXY7100U73O47dmandGyjhHpkE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=F0yBvyYHfR4qYB8/bYsKobCCXtExPP2Fp0B0krKmpkn4MWoh17fESwQsR/tEXza4Ii98kKBxWkwh9G6aR7aeAh/SEgBtPGLcVEpl7p2MNbNKZOtI06+TgK+mGZXD651S8Tc7yU8tY/Xp8mri4e9Z24oZldwVCKuIxZVYsv1722Q= 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=pujhKfnY; arc=none smtp.client-ip=209.85.222.180 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="pujhKfnY" Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-93e63ee7b4cso313867885a.2 for ; Thu, 08 Oct 2026 14:03:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda.com; s=google; t=1791493415; x=1792098215; 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=jtyJNESs2NfaCrmwRAvvPnxlfOHCunirXFuek+zM5MM=; b=pujhKfnY6XpqvzazTMREHza7p4Ap0e4jXF54QAp/Ylj9eUsbZRnO8OP3NEjY5Fvqo3 8kMI8mbVFhHWPPvySjc1pQLaP+ny3PCVvXAL4V6q7bb8OK+0ASMiaXgmvoIRIXA8Grwe FexMoCArOtOy/6geShmDaiRqC4j1giTROp5AS6hGimHvv9C0Jjhg0uoribobV888EV62 sSzFU5nziXYyYu590KlEhLUMYY4qwQTM16VryFW/h8z+CgqW4XecUVfVnZuzUBQoPyKt sLd/RqCYENJKXt5j77nLpxsDAPhp+GneOiV19SEX0UPVSduLLa2RTHG5NX6IfrRp6sa7 X/5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791493415; x=1792098215; 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=jtyJNESs2NfaCrmwRAvvPnxlfOHCunirXFuek+zM5MM=; b=nJiHT08WRCWoUQuN8f3se1xfeJRPc7j+FMCPH38pAcRRkKDQUUKgcUnk9Y49iLHlyU aTrKSOfVfrsP+DD3GJ51YfQOEuEogWE0Fy0f/NI9OMEs90i5NMeyv541tbab+xguLGDY I6KdN8lPEu4vYfCZ+A8w9w20LnGSvWIE3Kb0dJimfCzBdZKZ4YzZbapOuIPgdkeNw3zf XoujRxWGHRPJH59kabYKh7pOhfC4doIWCXNXYmuUwBqWcs0uZOeTEDodqeUV7SIe9+yV gGNAgcTCpTtabclLbb3ZrbQWWzjAPf1unJHaq9hO9qUKc0uz6oRqD1ucEIlUllVLlvfq 8qog== X-Forwarded-Encrypted: i=1; AKwUvBxOuRy2jobrpGxt3dJaY3sIEHmkz4Ec0y0rG0lhkYO4ww+X5znBBR9IKqO7FoWV2HhcixDrrpUfQf9Sep8=@vger.kernel.org X-Gm-Message-State: AFuF++kiNjofMm0lUn+NbmFfOHhFRw24LL70xEw5OK4z0BeNZDnV+iEd Qj2JhUZOSzymD/70gum+ie2H1lsU9T0iWL+2asNjlHeXbrh9QuL2O50BJFzcNSHOTUc= X-Gm-Gg: AYBFou24ijuMwDR+PPVuF2O+uBrfRMiQXA48wnVviGy/KHKQ/7gbZCeICXx15cSPYPf s2plW7p1t0msaSS0brdQZ9vwKkTp2ZkBW5v95tpllDvOVhCQzqhLb2xXdwULXJUaqN7MYBwNVcW FsqKDsRVOzEKTNnRWpIm67INmrDSrrMU7c/sGi23Sg+lCU4SdsTyjGSmJd4mLbemrVEqUzwM31a /7FfV5Ex4XrVRLT93NNvw6aGQX3aor5XwJbuHvx5KZ2/krNj/2wbNQO865D7IWr05YesQ+LR0IH bwlw+bZERw96dMt2/ERhbsRn6h6RXkQX3XOnfiY0QUfpIGuI8A1yhSoARRBfEDjvTKMeFb13Ad9 +Pt3u9bvXJmfAoQxSD/NCSiJrbuzr8Us3HM6YeZPkXu4eGPUGtWbNPuY98RH8v1qxdxCbd8OtrD RR3UCAvpNtJgeHbpi1VF0jJXNUg/S3rD2jql9BLRs4iBh7+6NzY+FJRanujlj3JeWZ6wQycUHCw TBIwN07GsvK2S4= X-Received: by 2002:a05:620a:4613:b0:934:ab73:ac53 with SMTP id af79cd13be357-93e9af42cd2mr1369444185a.0.1791493415593; Thu, 08 Oct 2026 14:03:35 -0700 (PDT) Received: from toxicpanda.com ([153.61.196.241]) by smtp.gmail.com with ESMTPSA id af79cd13be357-93eb986c0e9sm24158885a.20.2026.10.08.14.03.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2026 14:03:34 -0700 (PDT) From: Josef Bacik Date: Thu, 08 Oct 2026 21:02:53 +0000 Subject: [PATCH net-next v2 06/10] e1000: use pskb_may_pull() in the 82544 TSO workaround 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 Message-Id: <20261008-b4-pskb-pull-tail-drivers-v2-6-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=1221; i=josef@toxicpanda.com; h=from:subject:message-id; bh=yldyXc+k9IUGHFBVvbXY7100U73O47dmandGyjhHpkE=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgUBr36M/n0nWN0DNbnxwzIiCZez6MG JiruuNaSCI/zXsAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QO2CfzCzBOeK9ZW88WGSv+B3RUqXFGdARFKgVlna7gjBWdR0TdJniqj/mr2mdJ20mJNMEnviLw3 DiEJcfynbhAc= 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 for the 82544 TSO workaround. 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/e1000/e1000_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index d7f5c6f16142..3a55b211f5a6 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c @@ -3155,9 +3155,8 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, & 4) break; pull_size = min((unsigned int)4, skb->data_len); - if (!__pskb_pull_tail(skb, pull_size)) { - e_err(drv, "__pskb_pull_tail " - "failed.\n"); + if (!pskb_may_pull(skb, len + pull_size)) { + e_err(drv, "pskb_may_pull failed.\n"); dev_kfree_skb_any(skb); return NETDEV_TX_OK; } -- 2.55.0