Received: by 2002:a05:7412:da14:b0:e2:908c:2ebd with SMTP id fe20csp720059rdb; Fri, 6 Oct 2023 17:51:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFpPq1RESloUKeimQQOnqqpeTFsVJD1JnpFdU0v5Bk4IF7zxPZMLckWJkEMYaIFSCxAUpxK X-Received: by 2002:a05:6e02:188f:b0:351:1647:5fa0 with SMTP id o15-20020a056e02188f00b0035116475fa0mr11465450ilu.18.1696639914674; Fri, 06 Oct 2023 17:51:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696639914; cv=none; d=google.com; s=arc-20160816; b=FLwXn28HnW6L7R2faQpm8EConCaLKd71M8oiaJ+KBqo9TgcGk4gsL1BRt/czTvHApE ooXjtIp9aK6rFj/Mji2hc6BfRtBFZO7kuyn8jFdM2AAISFtrX5+ytSzloo5jRY0gFSm+ 68PcGCNHFnH+0sK2Tl0uKwStPe9QURb7mMzyFCh4w7brIQUL2XgTM7NJvn60gmYA9e8B sNruN7X6rCUEPW64jDtTSKpw5GdE16zLR/A6Lz+QwIdShPVDGb+z36oYmres//zK+NfE El12Dzm1rnzATgNL9dgPclgnkalRQhaEfeH5YJ+THvSDaG5++pWdzajkELrmIKJDtzvc UfmQ== 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=p3Qx7B082VtZrFxOuYcTvp7+pBO3IhmptOg+FirYoRY=; fh=NkYG/BtwYmH70emlcTd9wbdEtMJtEdZ2tgldtBsdB24=; b=rW6JymihdITWdEe0mNGYdlgkLCiMw6OCoRxsDUzCHK0jx5AaUuWZiVfW+CP403NZq7 Ij3WOBMBaSY7d8kVU8sExvcX6yH9QYShsz5kxwyV7711LwG8HbUAw7rupEQETB7UIFmp qBIWA6gpiEhIPRAiXzwO6LDrdq+GuHpfcDNHiCZZRp6ae5S/4Uz/2uga438DXU5YLxws 5vQo+5Y6l0kBZv2dvNrOM58qIAzDohyPabK60HfL9XT8Hi0lTajj6Pmw/8+QmuUb5Cs1 yVfwuxUb1xaWjprOviHMtkrEuY7kdjlD5R/R/fGCDa/ujFqNU4ExHBOatv+ZLvoGbGAf mGYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=l6pmgkCA; 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 c5-20020a6566c5000000b005774aba519asi2411100pgw.118.2023.10.06.17.51.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 17:51:54 -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=l6pmgkCA; 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 A7C0F801B8B0; Fri, 6 Oct 2023 17:51:52 -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 S233952AbjJGAvq (ORCPT + 99 others); Fri, 6 Oct 2023 20:51:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233879AbjJGAvp (ORCPT ); Fri, 6 Oct 2023 20:51:45 -0400 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C9437BD for ; Fri, 6 Oct 2023 17:51:42 -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=p3Qx7 B082VtZrFxOuYcTvp7+pBO3IhmptOg+FirYoRY=; b=l6pmgkCAodebYncQaXmxV 5k6RMMYuPSUmRT4u5AupptzsHN2NiEFmk47GZUtl834nZLPEz7OxHR/0UNA59CMw ANmedTEuCsJDNVCV0fbrzxIBZmq1VxgtpN8GPXZRpO1RBmIb+bNnKwjiTT3cOBhy yHzOCl8a9Bn06/xtypPL7g= Received: from icess-ProLiant-DL380-Gen10.. (unknown [183.174.60.14]) by zwqz-smtp-mta-g4-0 (Coremail) with SMTP id _____wD33OZ5qyBlC+QfEA--.50324S4; Sat, 07 Oct 2023 08:51:14 +0800 (CST) From: Ma Ke To: richard@nod.at, anton.ivanov@cambridgegreys.com, johannes@sipsolutions.net, xiangyang3@huawei.com, make_ruc2021@163.com Cc: linux-um@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] um: vector: fix return value check in vector_mmsg_rx Date: Sat, 7 Oct 2023 08:51:04 +0800 Message-Id: <20231007005104.3994678-1-make_ruc2021@163.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: _____wD33OZ5qyBlC+QfEA--.50324S4 X-Coremail-Antispam: 1Uf129KBjvdXoWrZFyUXr1DAw4kAFy8urW7Arb_yoWfXFX_Gw n7XanrJr4xKFn0qr1kCr13uryava1q9F95ZF1FqrW3ZwsxZw1xAF909r15A3WUWa9rGrsr Kr93GrW09r1rKjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRM5l8UUUUUU== X-Originating-IP: [183.174.60.14] X-CM-SenderInfo: 5pdnvshuxfjiisr6il2tof0z/xtbBFQICC2B9oZceNAAAsf 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 17:51:52 -0700 (PDT) X-Spam-Level: ** In vector_mmsg_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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c index 131b7cb29576..c280ce5ea6ce 100644 --- a/arch/um/drivers/vector_kern.c +++ b/arch/um/drivers/vector_kern.c @@ -1013,8 +1013,8 @@ static int vector_mmsg_rx(struct vector_private *vp, int budget) skb->ip_summed = CHECKSUM_UNNECESSARY; } } - pskb_trim(skb, - mmsg_vector->msg_len - vp->rx_header_size); + if (pskb_trim(skb, mmsg_vector->msg_len - vp->rx_header_size)) + return 0; skb->protocol = eth_type_trans(skb, skb->dev); /* * We do not need to lock on updating stats here -- 2.37.2