From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1420C3AD50A; Mon, 23 Mar 2026 14:08:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774274920; cv=none; b=mUnp591DG7Au3TFZDbiaNKAdgrWLdZDjc+WLW81PmDJ/sedLRQycWD/loyNmNVu0tnL3q3+ltEq557UaS/7YzPIkgoysVuXRaGB+S0WxAkkBerc2ghtJF238jl1FfsSh47OOGlRjCHii8tQw+3Tyo18Eyx3SOsYKS8L/H+0HBO0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774274920; c=relaxed/simple; bh=+ifZkeZtfjuAkWnmbv/nZDKVS0mf8D4tzvp4AYQbbV4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LLjA56Seun31g1ZejjiQfVN0UHqGgA/9FcLNakvJ+/tY0Xoc/GHIW/UOw3HCU7/LpSRhm7qDpPIY819UbWW4bgEdsF3abmU/MVMusDiUTSPrNcIsGI0kNnKJVcvFiAeqy4rHz4pUzqXKYrJ6bmpHljU3EyJMBHcMyDnW74pTwzw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Gl4KRPZR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Gl4KRPZR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A9FCC4CEF7; Mon, 23 Mar 2026 14:08:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774274920; bh=+ifZkeZtfjuAkWnmbv/nZDKVS0mf8D4tzvp4AYQbbV4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gl4KRPZR3C0QlRamqQXSse7my7NGwx5ZF5lFU0Px2b2HEMB7qJ9GfLECyAvMc9Pbz Ki4JPjh6/KbomUNygK/pKgXAG4fYbfWgYqagOrJjJpYc+22LCUbvUPMOTOxUN5ZXpZ j5+F4da+I40d2HJHtoPs8QqUDK3nEtxqiUKW8BSE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kohei Enju , Simon Horman , Paul Menzel , Avigail Dahan , Tony Nguyen , Sasha Levin Subject: [PATCH 6.18 156/212] igc: fix missing update of skb->tail in igc_xmit_frame() Date: Mon, 23 Mar 2026 14:46:17 +0100 Message-ID: <20260323134508.684462255@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134503.770111826@linuxfoundation.org> References: <20260323134503.770111826@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kohei Enju [ Upstream commit 0ffba246652faf4a36aedc66059c2f94e4c83ea5 ] igc_xmit_frame() misses updating skb->tail when the packet size is shorter than the minimum one. Use skb_put_padto() in alignment with other Intel Ethernet drivers. Fixes: 0507ef8a0372 ("igc: Add transmit and receive fastpath and interrupt handlers") Signed-off-by: Kohei Enju Reviewed-by: Simon Horman Reviewed-by: Paul Menzel Tested-by: Avigail Dahan Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/igc/igc_main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index 89a321a344d26..55d6feccc7745 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -1730,11 +1730,8 @@ static netdev_tx_t igc_xmit_frame(struct sk_buff *skb, /* The minimum packet size with TCTL.PSP set is 17 so pad the skb * in order to meet this minimum size requirement. */ - if (skb->len < 17) { - if (skb_padto(skb, 17)) - return NETDEV_TX_OK; - skb->len = 17; - } + if (skb_put_padto(skb, 17)) + return NETDEV_TX_OK; return igc_xmit_frame_ring(skb, igc_tx_queue_mapping(adapter, skb)); } -- 2.51.0