Received: by 2002:a05:7412:da14:b0:e2:908c:2ebd with SMTP id fe20csp317731rdb; Fri, 6 Oct 2023 04:42:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH0MQ+X8xTr9a08O4P0h7nuWP9TJHiOL5cWrbdPlacCZebP5Atmf5r3l4sQ61DU0RjMe8i+ X-Received: by 2002:a05:6830:1e89:b0:6b9:a926:4a12 with SMTP id n9-20020a0568301e8900b006b9a9264a12mr7780441otr.28.1696592566050; Fri, 06 Oct 2023 04:42:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696592566; cv=none; d=google.com; s=arc-20160816; b=kvlRRHKWC9AulXyTEHcSWLbWlLblaVYEN56M3D0hOsGnzU70M8+x+hhCgEBuYN5j3E iDgHvBU0YCUyyBH+sWIQLuvh6Z6H6VxcS08gR/h30hJf+v4rea2y37CXyure1QfCeUHK bNA8mX5eoYiDE99snZJ4mc4mPhVfi9gj/5YwM4gUTb2AOuZIs/CvQAk5AHVJjo4taUhs BZv8fmv6MPbvfi5KKL1HAA89fEN7G4YEamHLyRdJvEO6ivJXcy7KevQU7/E7ucNF02m8 byDNykP/7fTF5+L7JZk9cs8HWtUX1LwiswgS/Th6VJcEvcUokJ4Y4VOUdEwsFqzw4HI4 Md0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=skzg0FxcauA9cDyPuWsiRc28EhNtwMYJk3uNIp52Two=; fh=0R61InDWrnZOYSYWzxkays9cDDbTMx0i2DUlv50FCMM=; b=vfvgpFN7h6eH2+R4Oi2sIVYUv8giFE5awPjXSrfDTvb26PBCBMz5DDRWIvO5Z6+vVh DH4yTV8ZjeyKoxU7Y0LwySyKWF+CHn32LLWMd93gltkclmml+PQvuFb53cpR8bbIqF4J ur/EBX0e1sXCBQtHDZkHAgGdWgRkQDOPp9sEzcgWqbw8rILJGnzpm5TO/x0Wx4a2bab8 FR4bvHTWHsPPxmIxXu4VYhtBpQrw7j8y6Jx6WvBSrBaIBH92Bwpbu6+bez28exfcgTWX ciHrnwLiSvoK8pICbu/L6WYtRHIkVEQQcACHwQcDXFGSh05cq8HIg6fpwq6W9pRKJUlX fu0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=aHWPsWrH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Return-Path: Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id s1-20020a63dc01000000b0058978136257si2639852pgg.486.2023.10.06.04.42.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:42:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=aHWPsWrH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id F34CE818B80C; Fri, 6 Oct 2023 04:42:43 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232018AbjJFLmi (ORCPT + 99 others); Fri, 6 Oct 2023 07:42:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231935AbjJFLmh (ORCPT ); Fri, 6 Oct 2023 07:42:37 -0400 Received: from m15.mail.163.com (m15.mail.163.com [45.254.50.219]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 856AACA; Fri, 6 Oct 2023 04:42:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=skzg0 FxcauA9cDyPuWsiRc28EhNtwMYJk3uNIp52Two=; b=aHWPsWrHQ2Qv9sbpwKOeu NoZaMn16SRIIk9xtQ2XYGVbhoR5nUzcE7xR1ou/H+k4mA9rSfZdCKadf+xqvBGzs nLM4k3oIxCsWOa/a//ldZbNWJEqJluk5hjmd6ushrDmJbBDeg8Iky0LAbT0gGPUX J6mF6vodU/rILF+MhgTol4= Received: from icess-ProLiant-DL380-Gen10.. (unknown [183.174.60.14]) by zwqz-smtp-mta-g0-4 (Coremail) with SMTP id _____wAHKPRU8h9lnBHVCA--.49032S4; Fri, 06 Oct 2023 19:41:10 +0800 (CST) From: Ma Ke To: steffen.klassert@secunet.com, herbert@gondor.apana.org.au, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ma Ke Subject: [PATCH] net: xfrm: fix return value check in ipcomp_compress Date: Fri, 6 Oct 2023 19:41:06 +0800 Message-Id: <20231006114106.3982925-1-make_ruc2021@163.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: _____wAHKPRU8h9lnBHVCA--.49032S4 X-Coremail-Antispam: 1Uf129KBjvdXoWrtw1fWw4rWFW7CFW3Kr43Awb_yoW3CFX_CF WIqrsrur90vrn3Aw4kArZxtr9rXan8ur1vqr92qFWDZ34kAas5u3s7XrZxua15GFyDGFy7 Can0gFZ7AwnxWjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRKSoXUUUUUU== X-Originating-IP: [183.174.60.14] X-CM-SenderInfo: 5pdnvshuxfjiisr6il2tof0z/1tbiyBgBC1p7MBefHAAAsf X-Spam-Status: No, score=3.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_SBL_CSS, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 06 Oct 2023 04:42:44 -0700 (PDT) X-Spam-Level: ** In ipcomp_compress, to avoid an unexpected result returned by pskb_trim, we should check the return value of pskb_trim(). Signed-off-by: Ma Ke --- net/xfrm/xfrm_ipcomp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c index 9c0fa0e1786a..5f2e6edadf48 100644 --- a/net/xfrm/xfrm_ipcomp.c +++ b/net/xfrm/xfrm_ipcomp.c @@ -144,7 +144,9 @@ static int ipcomp_compress(struct xfrm_state *x, struct sk_buff *skb) memcpy(start + sizeof(struct ip_comp_hdr), scratch, dlen); local_bh_enable(); - pskb_trim(skb, dlen + sizeof(struct ip_comp_hdr)); + err = pskb_trim(skb, dlen + sizeof(struct ip_comp_hdr)); + if (unlikely(err)) + goto out; return 0; out: -- 2.37.2