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 9188EC4332F for ; Sun, 29 Oct 2023 22:56:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231154AbjJ2W4d (ORCPT ); Sun, 29 Oct 2023 18:56:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231545AbjJ2Wzx (ORCPT ); Sun, 29 Oct 2023 18:55:53 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F3901704; Sun, 29 Oct 2023 15:55:18 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C83A2C433CA; Sun, 29 Oct 2023 22:55:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620113; bh=eUjcKlQkiQMmDAOJsdJAc0CFl7asc0wPC/b06ukdS4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fIFZGbWdt3N0ThmGHT3m5CKkwIbCsREQJVVNo8/k1KWsqkl7ovV81RRIOmMTVDeDQ EqmdB0x4oy3Tl1mQwx3aqzakJff83zR9NqLPDWQUx7m6zKD5WDv+Wte8U+sK3ezGbY 9LBIdR8ILXcC4RD/c4IHTEWyxoFEox9htsaoguuqKKMfx0bN7YXDndI+ww/sZoTm2I qHlHO37c7mhku5piIUFRFWQbRMi977DJd7o+j7x1Er/hJUxhSEXBMVUMlZa1xFzdSp SavP2pUoo2g1RfQN7rr1ZMX9kT0IZXdOnxfQWaY/8M8qGVKNSiMZs0TiJHqM3ItZbb F7Z/aGOgRUxsg== 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 6.5 21/52] net: ipv4: fix return value check in esp_remove_trailer Date: Sun, 29 Oct 2023 18:53:08 -0400 Message-ID: <20231029225441.789781-21-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231029225441.789781-1-sashal@kernel.org> References: <20231029225441.789781-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.9 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 2be2d49225573..d18f0f092fe73 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -732,7 +732,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