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 EFF31C4167D for ; Sun, 29 Oct 2023 23:30:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232559AbjJ2Xay (ORCPT ); Sun, 29 Oct 2023 19:30:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232416AbjJ2XaZ (ORCPT ); Sun, 29 Oct 2023 19:30:25 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C04D95279; Sun, 29 Oct 2023 16:00:24 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8DD0C433BA; Sun, 29 Oct 2023 23:00:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620424; bh=7BLUuQbVqCRf3oKWp1YEvzvjaufcp13WqMaqpaN7FM8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ddleoIAC3QQX7TEoPsqkZW1zXPvwFDC+HJ8rOnjajOYqClC01V8Dea3Vm1n5ey4/g CBJy83H0N+bRyj+Cio3BxRJJylX5HJOP2apGFcLf5OZ38uOVEuMvQYDsrWkROhmDXX +cAAPDse5DeHJps1OSsVyKOINdQhJHP7tqc8BSAhGLlDdgrZOku5PqU5ea7pOfO7Xy Ti13euAbmS7jeB+g9NfOKJcOCtjHAiA8ZAf4oVyfSFkom3t8uLxUlYv49ueva7eq9R tsVUGfBhQgebdBnf8yNLRWYyaIg7pJhFgMpxKUTdRA8jNfOA+Dxu+kVLss6xWNLs9L memFupG6alOXA== 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.10 05/16] net: ipv4: fix return value check in esp_remove_trailer Date: Sun, 29 Oct 2023 18:59:51 -0400 Message-ID: <20231029230014.792490-5-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231029230014.792490-1-sashal@kernel.org> References: <20231029230014.792490-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.199 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 28252029bd798..412a3c153cad3 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -741,7 +741,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