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 E9401C4332F for ; Sun, 29 Oct 2023 23:00:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231680AbjJ2XAG (ORCPT ); Sun, 29 Oct 2023 19:00:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231588AbjJ2W7Y (ORCPT ); Sun, 29 Oct 2023 18:59:24 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1BE4F47B0; Sun, 29 Oct 2023 15:58:46 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75DA9C433C9; Sun, 29 Oct 2023 22:58:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620281; bh=PDqOes406CTDIQMaICBba0Z0k8SUC3PaSei4d0V58qs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XKq65EibJrRPkqy+CCanSbZt3Jhq7yDru/pFkzSMiKAzDdGbU+nB7B3HqO+TyWMbQ +dCZ3yLJRs15mlNgNBgjjTPr10Xtp4g5ESCGIZXfKIXS495TM6I/3EIAN8gQ/U1qR1 an91DF9Yy5tRnEZUTihkY6bMD7vhJLp+4RZibQ5ruwkLejJBkxsuWbMesZnbo8+1t0 qWOkGFZGdymU+A/bOMMZdgRddXv3fMf5UwqrqyxS7W61YYZPKvQGr0O9zGUtzGN5f1 5cbcuSwGLa8NvgcGu8OAvNbM/feFTctiWBEg47xapMeOJxRsO9eCJlqrn5zFXK3t28 qR2hOfdholAKw== 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.1 15/39] net: ipv4: fix return value check in esp_remove_trailer Date: Sun, 29 Oct 2023 18:56:47 -0400 Message-ID: <20231029225740.790936-15-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231029225740.790936-1-sashal@kernel.org> References: <20231029225740.790936-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.60 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 2d094d417ecae..e2546961add3e 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