From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 674443093DD; Mon, 13 Oct 2025 15:03:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760367829; cv=none; b=Lir14qvmRRQrR04cugG81VaKzvyIV0j/TW6LchVxb5L2CXGwZ6GpHQ+M1QepjeD1pDFss7zEYyiNoWDYT3CQhEh7ezmcbIHTxIEhR480eWrvi0p1USXFi1RusFflLIqBmhypCWb59SI5x+vbe/CTqKuY/K2VYNx5F32Lv721apU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760367829; c=relaxed/simple; bh=dodF4yWw74NkMjSs/d1FmQL1mcBdvsh57jhyVkdHHKA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uXQE6QRPcX+ZZCGC/Ze1wz8xmN/KGFuxVOhtz0I+3+Zbhr4NpfdnU/rU/5wbCmN7mNb99PWaYknGYjSiXfCRxJJUgDKU7+wuSwYrvs2kIArSaaqLaf4CasMRLP2TK8qvIYiGtF7eFq6g0g+ebIsQ0RBFa4a6FxPGMIBn2uggADo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ny8VIbgd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ny8VIbgd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCE16C113D0; Mon, 13 Oct 2025 15:03:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1760367829; bh=dodF4yWw74NkMjSs/d1FmQL1mcBdvsh57jhyVkdHHKA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ny8VIbgdFmO5g+DYCybIFuXyLxR2Iq2rp2SZL3snpQcmNrrMB7WQhLlL9QHc2+Oot XGbAsCLDs9sHobBJZfAiCS6dQVJbzEri4//FTb6ctHJrVDEGOecP8gcu+wtlg6QYIO XFRi8R6IUBJnKyvzvthZFNThcqeMIbhJPm0vA+KA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, zhang jiao , "Michael S. Tsirkin" , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 149/196] vhost: vringh: Fix copy_to_iter return value check Date: Mon, 13 Oct 2025 16:45:40 +0200 Message-ID: <20251013144320.701875407@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013144315.184275491@linuxfoundation.org> References: <20251013144315.184275491@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michael S. Tsirkin [ Upstream commit 439263376c2c4e126cac0d07e4987568de4eaba5 ] The return value of copy_to_iter can't be negative, check whether the copied length is equal to the requested length instead of checking for negative values. Cc: zhang jiao Link: https://lore.kernel.org/all/20250910091739.2999-1-zhangjiao2@cmss.chinamobile.com Signed-off-by: Michael S. Tsirkin Reviewed-by: Simon Horman Fixes: 309bba39c945 ("vringh: iterate on iotlb_translate to handle large translations") Link: https://patch.msgid.link/cd637504a6e3967954a9e80fc1b75e8c0978087b.1758723310.git.mst@redhat.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/vhost/vringh.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c index 7b8fd977f71cc..60961c65fd472 100644 --- a/drivers/vhost/vringh.c +++ b/drivers/vhost/vringh.c @@ -1237,6 +1237,7 @@ static inline int copy_to_iotlb(const struct vringh *vrh, void *dst, struct iov_iter iter; u64 translated; int ret; + size_t size; ret = iotlb_translate(vrh, (u64)(uintptr_t)dst, len - total_translated, &translated, @@ -1254,9 +1255,9 @@ static inline int copy_to_iotlb(const struct vringh *vrh, void *dst, translated); } - ret = copy_to_iter(src, translated, &iter); - if (ret < 0) - return ret; + size = copy_to_iter(src, translated, &iter); + if (size != translated) + return -EFAULT; src += translated; dst += translated; -- 2.51.0