]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
vhost: vringh: Fix copy_to_iter return value check
authorMichael S. Tsirkin <mst@redhat.com>
Thu, 25 Sep 2025 06:04:08 +0000 (02:04 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Oct 2025 09:56:37 +0000 (11:56 +0200)
[ 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 <zhangjiao2@cmss.chinamobile.com>
Link: https://lore.kernel.org/all/20250910091739.2999-1-zhangjiao2@cmss.chinamobile.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Simon Horman <horms@kernel.org>
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 <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/vhost/vringh.c

index 10bfc5f1c50d5d66aca9c2aafe8be07a1ea69a6e..c570d214d5b68b16fb703e00d145c4b3b6927884 100644 (file)
@@ -1195,6 +1195,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,
@@ -1206,9 +1207,9 @@ static inline int copy_to_iotlb(const struct vringh *vrh, void *dst,
 
                iov_iter_bvec(&iter, ITER_DEST, iov, ret, 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;