From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EEE39C001B0 for ; Sun, 13 Aug 2023 15:51:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229736AbjHMPvc (ORCPT ); Sun, 13 Aug 2023 11:51:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230454AbjHMPvN (ORCPT ); Sun, 13 Aug 2023 11:51:13 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7A7730DC; Sun, 13 Aug 2023 08:50:51 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1D93A63231; Sun, 13 Aug 2023 15:50:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02D3CC433CD; Sun, 13 Aug 2023 15:50:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691941829; bh=T1ipUjyWapBEp+xLdE4se2hvvu5d1xSQrBSrhA9V8TE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KYxEDYVxmYMzOaHkq4A/LGkvEUSHAc+038NBf+72WUWTiKOdggI+MYR3dVqGG569l uZi84UoZEbmt/p1tyvqXxXWK47a3Zp/MouFkrFeJLx/YGkGOKEqxdTGAzLttzg15Gh cSvzU9SqDQU3/LzhLdEq/bkaqGno8J0hDhTjv1wpVenr8an5UFxyw7iCthK2L12HJs 8vfQUt3J9qEAdeHudV4MsOIcMM/mzH/UDvNVV34I36DHg59bWfRRk2dmoLxp3gcJXi 7XglvcEKZ2DbL3V1weUe72M9TPw1r1N8WgxflK2ZL8i3nsoKnw2sXSEzpZ4JvEIivw iNKYFXevb24LQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yuanjun Gong , Simon Horman , "David S . Miller" , Sasha Levin , chris.snook@gmail.com, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mkl@pengutronix.de, trix@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.4 20/54] ethernet: atheros: fix return value check in atl1c_tso_csum() Date: Sun, 13 Aug 2023 11:48:59 -0400 Message-Id: <20230813154934.1067569-20-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230813154934.1067569-1-sashal@kernel.org> References: <20230813154934.1067569-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.4.10 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Yuanjun Gong [ Upstream commit 8d01da0a1db237c44c92859ce3612df7af8d3a53 ] in atl1c_tso_csum, it should check the return value of pskb_trim(), and return an error code if an unexpected value is returned by pskb_trim(). Signed-off-by: Yuanjun Gong Reviewed-by: Simon Horman Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index 4a288799633f8..940c5d1ff9cfc 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c @@ -2094,8 +2094,11 @@ static int atl1c_tso_csum(struct atl1c_adapter *adapter, real_len = (((unsigned char *)ip_hdr(skb) - skb->data) + ntohs(ip_hdr(skb)->tot_len)); - if (real_len < skb->len) - pskb_trim(skb, real_len); + if (real_len < skb->len) { + err = pskb_trim(skb, real_len); + if (err) + return err; + } hdr_len = skb_tcp_all_headers(skb); if (unlikely(skb->len == hdr_len)) { -- 2.40.1