Received: by 2002:a05:7412:da14:b0:e2:908c:2ebd with SMTP id fe20csp344709rdb; Fri, 6 Oct 2023 05:28:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG6rdljc31iCKp1bB+FxIPzSrqrPVVp3umubqbnOenpc2yAbvFaIANJnGRYm/VJNgx6Buwj X-Received: by 2002:a05:6a20:100d:b0:16b:ce7d:874d with SMTP id gs13-20020a056a20100d00b0016bce7d874dmr1180429pzc.6.1696595318768; Fri, 06 Oct 2023 05:28:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696595318; cv=none; d=google.com; s=arc-20160816; b=qwtbXUlmzI7J8LGaYYRjgDISNGk9qaKb/7NBBHzaj5qDbCLcc+7uioRzBdOPK6jCKI CvvwwmU3TypPFT6YWdVntURZLN66u084e70256N0+2P3gRrfQMU+a91nmP0s9FV0Zz8H dkLkNVe1xevnfcPlTcw2QKozXOwh3vQShye49F3zJcT8EkzXkZ4aj3t7QQC4A8NuSmMf B0P5lMeLiCP98KJFadV3JLdKPDZbklOhor8US685wsl2i3xMeuyC66wF9bHutlkUJDeQ qWG3Li5H/gfgXOIF/HKe7qu/t99GwGEu1EDMOxzZ+hZnd7Krw/jJejlCczk7SfYShpas ReUg== 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=1a/vWnH3Ah5pXEyFX/8tf2+Zvr5M8bQvxpTQY3e+UqA=; fh=4BsSyq5Nbk0aCadf1f6C5dhDfIvt8g1z5TfreoL0ix0=; b=fTihzrBLlmLFlCsD8xSo7SMTl3VJNvC5rZZcFEQ/f3Prd5Fw4/4KsUQ8czUpjh5pIF Gt07L9//byc3+t3Zdry8sPWCWPwn6Ibqxh7xfjdTqmFlZjvtoaRqRfOO/zBtfJdJyBtR uIihqYs6TJVpmSdkAcBuQZsOc6NP6I2OMuiRjo4RpKYbIIR4C9dTBqgdvVA0lyIrAseo e5KfFv1B3JAh3KFa8LsMm0wcB4sA6zRgB2PY4t6w4p4jCP2lhSH0lU3cpuF4Koz6zJlz 7hyxAst5pku92mwu7yjbkwzj5rvEMf5HJJymMCXShOWxPt5Y7Dlym9mncBNMm/oAiyEC si8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=C2T7kyfW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id w2-20020a170902c78200b001bbacfdad2fsi3419730pla.291.2023.10.06.05.28.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 05:28:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=C2T7kyfW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 461BA8374324; Fri, 6 Oct 2023 05:28:36 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232123AbjJFM20 (ORCPT + 99 others); Fri, 6 Oct 2023 08:28:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231262AbjJFM2V (ORCPT ); Fri, 6 Oct 2023 08:28:21 -0400 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.196]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AE3F4CA for ; Fri, 6 Oct 2023 05:28:18 -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=1a/vW nH3Ah5pXEyFX/8tf2+Zvr5M8bQvxpTQY3e+UqA=; b=C2T7kyfWIAIMoRJ/bRm2z xeT3mpMXCpdPWWNAMnQ8dsaGaPQdGELhq0nz99G9DzEyLGaQ/Co3dPNbpdmy7Tva itDV8YzNT5/RNMS08f29Y6bUuyLAqoHNkc4VzElSalnNWBf7gj08o9hqN3LnWCho Eiyw7Az5WzGNa4wglW5IP4= Received: from icess-ProLiant-DL380-Gen10.. (unknown [183.174.60.14]) by zwqz-smtp-mta-g3-4 (Coremail) with SMTP id _____wAnLUQn_R9lBEAAEA--.49286S4; Fri, 06 Oct 2023 20:27:28 +0800 (CST) From: Ma Ke To: richard@nod.at, anton.ivanov@cambridgegreys.com, johannes@sipsolutions.net, make_ruc2021@163.com, xiangyang3@huawei.com Cc: linux-um@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] um: vector: fix return value check in vector_legacy_rx Date: Fri, 6 Oct 2023 20:27:17 +0800 Message-Id: <20231006122717.3984017-1-make_ruc2021@163.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: _____wAnLUQn_R9lBEAAEA--.49286S4 X-Coremail-Antispam: 1Uf129KBjvdXoWrZFyUXr1DCr1kZF4DAFyUGFg_yoWfGrX_Kw 1xZanrGr47Grn8Xr1DGF13urya93WkZFZ8Z3WFqr9xZw43Z34fAws0qrn8A3WUWay7Wwsr Kry3GrWjkw1rKjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7sRNeOJUUUUUU== X-Originating-IP: [183.174.60.14] X-CM-SenderInfo: 5pdnvshuxfjiisr6il2tof0z/xtbBFRkBC2B9oZDe6wABse 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 groat.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 (groat.vger.email [0.0.0.0]); Fri, 06 Oct 2023 05:28:36 -0700 (PDT) X-Spam-Level: ** In vector_legacy_rx, to avoid an unexpected result returned by pskb_trim, we should check the return value of pskb_trim(). Signed-off-by: Ma Ke --- arch/um/drivers/vector_kern.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c index 131b7cb29576..822a8c0cdcc1 100644 --- a/arch/um/drivers/vector_kern.c +++ b/arch/um/drivers/vector_kern.c @@ -890,7 +890,8 @@ static int vector_legacy_rx(struct vector_private *vp) skb->ip_summed = CHECKSUM_UNNECESSARY; } } - pskb_trim(skb, pkt_len - vp->rx_header_size); + if (pskb_trim(skb, pkt_len - vp->rx_header_size)) + return 0; skb->protocol = eth_type_trans(skb, skb->dev); vp->dev->stats.rx_bytes += skb->len; vp->dev->stats.rx_packets++; -- 2.37.2