vhost-vdpa: Fix integer overflow in vhost_vdpa_process_iotlb_update()
authorXie Yongji <xieyongji@bytedance.com>
Wed, 28 Jul 2021 13:07:55 +0000 (21:07 +0800)
committerSasha Levin <sashal@kernel.org>
Thu, 26 Aug 2021 12:35:42 +0000 (08:35 -0400)
[ Upstream commit 0e398290cff997610b66e73573faaee70c9a700e ]

The "msg->iova + msg->size" addition can have an integer overflow
if the iotlb message is from a malicious user space application.
So let's fix it.

Fixes: 1b48dc03e575 ("vhost: vdpa: report iova range")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Link: https://lore.kernel.org/r/20210728130756.97-1-xieyongji@bytedance.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/vhost/vdpa.c

index 80184153ac7d90c51be157c033fc36d4c0122083..c4d53ff06bf858abcb2f904720bd802a43cc3d45 100644 (file)
@@ -623,7 +623,8 @@ static int vhost_vdpa_process_iotlb_update(struct vhost_vdpa *v,
        long pinned;
        int ret = 0;
 
-       if (msg->iova < v->range.first ||
+       if (msg->iova < v->range.first || !msg->size ||
+           msg->iova > U64_MAX - msg->size + 1 ||
            msg->iova + msg->size - 1 > v->range.last)
                return -EINVAL;