From patchwork Sat Oct 7 00:51:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ma Ke X-Patchwork-Id: 1844664 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=eskZ7k4l; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.a=rsa-sha256 header.s=s110527 header.b=l6pmgkCA; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S2RZR4N7Pz1yq7 for ; Sat, 7 Oct 2023 11:51:41 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=kLwMcljxAo2xPPtm30mnpQDYCssJPsjBTMBIUN9Ogxk=; b=eskZ7k4lSIwgUi onZlhWPlTK4C4Y03swB5sAtpCeFQ95frZHSrqCH8Xv0njceEkoVPQoai5UfybFd7kHqCbW8oigdsT YPdVl89zmB43FX7doxegUxLAVEuyqsG+Dk5veMpj8br+iamc+REFZ9ioQVfZrNl6jgq90loW0yfXK RAeRkktfICzCPOLr/gkhkWnextp5+d9uBCVMqJEwGRFFcCAKIHfItU8JU8r+ikTynM0DYbHdamlo/ 8UVJh8KdF2qB2kNI9lzJyleoUag+jcBd1HwoXaR9XqmHEvSRJ5TCk9ye2xUe0HJy9Sn++o5S0jNBy nBbpnmtUiF4/up9D8lEA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qovXU-006itx-0D; Sat, 07 Oct 2023 00:51:28 +0000 Received: from m12.mail.163.com ([220.181.12.215]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qovXQ-006isy-2L for linux-um@lists.infradead.org; Sat, 07 Oct 2023 00:51:26 +0000 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231006_175125_160720_EA6EF024 X-CRM114-Status: UNSURE ( 9.89 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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(-) Content analysis details: (0.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [220.181.12.215 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [make_ruc2021[at]163.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [make_ruc2021[at]163.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 RCVD_IN_MSPIKE_L4 RBL: Bad reputation (-4) [220.181.12.215 listed in bl.mailspike.net] 0.0 RCVD_IN_MSPIKE_BL Mailspike blacklisted X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-um" Errors-To: linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org 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