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 EEA6BC4167B for ; Sun, 29 Oct 2023 23:28:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231807AbjJ2X20 (ORCPT ); Sun, 29 Oct 2023 19:28:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232207AbjJ2X2H (ORCPT ); Sun, 29 Oct 2023 19:28:07 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 169394784; Sun, 29 Oct 2023 15:59:38 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F3FD5C116C9; Sun, 29 Oct 2023 22:59:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620378; bh=xHeb9um9iaQhOx5M0DAoAvBFBPtVgsYZG1MFY91F2Wo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fM3UsshmQCRrFG0OIwoadziwS2sbvaoHWjP3GESHCSYCrHoNpK7eDiMcXDvO6LD+v 89XrIPPBRc3vOF4MTumQ0D0ifHmT6pyn1io/NQ5RPG3LwuVfHBDv3MOFKDTIMjy/Ke O3O266hrOVG4nKh8A/poOywe0tFpu56k5htICEa0pJneDRDbkxIHiOHLhPkvlBAtKZ XMWmdH0bMwlV0daa0OTHeL53JnyCx6inME5eA/sre/Rwz6lyyqMRBpqB+ivb40ufdf 4NDnEgdF2em1g+1/xCYlL9pPX4xP20CaQRxdoba8nca3gacQ+qyzkxiHi+vSYm1DNe 04JoJagTzEC6w== 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.15 15/28] net: ipv4: fix return value check in esp_remove_trailer Date: Sun, 29 Oct 2023 18:58:50 -0400 Message-ID: <20231029225916.791798-15-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231029225916.791798-1-sashal@kernel.org> References: <20231029225916.791798-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.137 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ma Ke [ Upstream commit 513f61e2193350c7a345da98559b80f61aec4fa6 ] 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/ipv4/esp4.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 386e9875e5b80..ca0cd94eb22d1 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -739,7 +739,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