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 AEB46C4332F for ; Sun, 29 Oct 2023 23:07:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231961AbjJ2XHW (ORCPT ); Sun, 29 Oct 2023 19:07:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232147AbjJ2XG7 (ORCPT ); Sun, 29 Oct 2023 19:06:59 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCE4461AC; Sun, 29 Oct 2023 16:01:04 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31E6EC433BF; Sun, 29 Oct 2023 23:01:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620464; bh=G+x1b/71Vpy6RjjeRi6tweidqNxWP69rwQCKh25RYg0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LjTET/eKOdchQ9y39RFwDcdhqcv/Lqx7EZGo6FgKsvXpvkgwmm8nigtCMxYuan01f AHvNFAxU6u/bUmSNbAFgKbhOKoIAs+r/XXEzPCjIdlVlclNGqQwukWyQKDHjGRdfob jiloxpbEAM1jIAISgjjFnyBMzjeN08ValbXAriPzizfbw/xxlTUllHEYiRxqmO9k06 ZaQyIuhxMYwcFb76L1QrgJAu7E0skt+eb4z7D+6VuF7DI0kQqaUT8Wh3HtU6fQzJpc FQjzLFqwMK6zsWtTASoDaJzyOm/BmCdABp2+rp/K5rVb3DoSAcZttywodXqeuCFt+k Yxoeul7alJBmg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ma Ke , Steffen Klassert , Sasha Levin , davem@davemloft.net, dsahern@kernel.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 03/13] net: ipv6: fix return value check in esp_remove_trailer Date: Sun, 29 Oct 2023 19:00:36 -0400 Message-ID: <20231029230057.792930-3-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231029230057.792930-1-sashal@kernel.org> References: <20231029230057.792930-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.259 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ma Ke [ Upstream commit dad4e491e30b20f4dc615c9da65d2142d703b5c2 ] In esp_remove_trailer(), to avoid an unexpected result returned by pskb_trim, we should check the return value of pskb_trim(). Signed-off-by: Ma Ke Signed-off-by: Steffen Klassert Signed-off-by: Sasha Levin --- net/ipv6/esp6.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index b64791d3b0f81..a1cdb43e72167 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -506,7 +506,9 @@ static inline int esp_remove_trailer(struct sk_buff *skb) skb->csum = csum_block_sub(skb->csum, csumdiff, skb->len - trimlen); } - pskb_trim(skb, skb->len - trimlen); + ret = pskb_trim(skb, skb->len - trimlen); + if (unlikely(ret)) + return ret; ret = nexthdr[1]; -- 2.42.0