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 E4305C41535 for ; Sun, 29 Oct 2023 23:08:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231558AbjJ2XIO (ORCPT ); Sun, 29 Oct 2023 19:08:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232207AbjJ2XHg (ORCPT ); Sun, 29 Oct 2023 19:07:36 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06F22A256; Sun, 29 Oct 2023 16:03:19 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B87D1C116B3; Sun, 29 Oct 2023 23:01:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620502; bh=goJV26ZqxKaajKxsSQOmOGfB5nf8mr6roUJx9ktXH+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aXgsihZ9ORuZ+Uz7cUxvVw7R1VFg7Uv48wMoNF1YoejN1tHq7S/Lk2x7f1/nMGs09 kVqhtmYsHMsMZtc63VCk60Zz6yfGdUVtB+cOdc/oWC7i2vX6K9UN0PFMjqeBg/IiSq JiOhmSpN/xkjpMQxmLkkc0JT+cQ/fX4bgf/H0eZL31JE1PodGFxpax6evZZkqlZvWg ithqhmBBB6EgKtBkVGNLBKRVkqkTxbT3EjDj/DayJMPnGtZwkFflcEUl0YYV3u3L6r WpqdkLqBU/KS8gWjWbuZGAN9YCELZsnULY1d2+lL0RgdrI2MEdu+yc1Ibvq7EbCCGz fTOYt/248NnWQ== 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 4.19 03/12] net: ipv4: fix return value check in esp_remove_trailer Date: Sun, 29 Oct 2023 19:01:16 -0400 Message-ID: <20231029230135.793281-3-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231029230135.793281-1-sashal@kernel.org> References: <20231029230135.793281-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.19.297 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@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 203569500b914..24cd5c9c78392 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -565,7 +565,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