From: Dan Carpenter <dan.carpenter@oracle.com>
To: "Michael S. Tsirkin" <mst@redhat.com>,
Xie Yongji <xieyongji@bytedance.com>,
Tiwei Bie <tiwei.bie@intel.com>
Cc: "Jason Wang" <jasowang@redhat.com>, "Eli Cohen" <elic@nvidia.com>,
"Parav Pandit" <parav@nvidia.com>,
"Eugenio Pérez" <eperezma@redhat.com>,
virtualization@lists.linux-foundation.org, kvm@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: [PATCH v3] vduse: vduse: check that offsets are within bounds
Date: Tue, 7 Dec 2021 14:48:35 +0300 [thread overview]
Message-ID: <20211207114835.GA31153@kili> (raw)
In vduse_dev_ioctl(), the "config.offset" comes from the user. There
needs to a check to prevent it being out of bounds. The "config.offset"
and "dev->config_size" variables are both type u32. So if the offset is
out of bounds then the "dev->config_size - config.offset" subtraction
results in a very high u32 value.
The vhost_vdpa_config_validate() function has a similar issue, but there
the "size" is long type so the subtraction works on 64bit system and
this change only affects 32bit systems.
Fixes: c8a6153b6c59 ("vduse: Introduce VDUSE - vDPA Device in Userspace")
Fixes: 4c8cf31885f6 ("vhost: introduce vDPA-based backend")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v2: the first version had a reversed if statement
v3: fix vhost_vdpa_config_validate() as pointed out by Yongji Xie.
drivers/vdpa/vdpa_user/vduse_dev.c | 3 ++-
drivers/vhost/vdpa.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c
index c9204c62f339..1a206f95d73a 100644
--- a/drivers/vdpa/vdpa_user/vduse_dev.c
+++ b/drivers/vdpa/vdpa_user/vduse_dev.c
@@ -975,7 +975,8 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd,
break;
ret = -EINVAL;
- if (config.length == 0 ||
+ if (config.offset > dev->config_size ||
+ config.length == 0 ||
config.length > dev->config_size - config.offset)
break;
diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c
index 29cced1cd277..e3c4f059b21a 100644
--- a/drivers/vhost/vdpa.c
+++ b/drivers/vhost/vdpa.c
@@ -197,7 +197,7 @@ static int vhost_vdpa_config_validate(struct vhost_vdpa *v,
struct vdpa_device *vdpa = v->vdpa;
long size = vdpa->config->get_config_size(vdpa);
- if (c->len == 0)
+ if (c->len == 0 || c->off > size)
return -EINVAL;
if (c->len > size - c->off)
--
2.20.1
next reply other threads:[~2021-12-07 11:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-07 11:48 Dan Carpenter [this message]
2021-12-08 3:43 ` [PATCH v3] vduse: vduse: check that offsets are within bounds Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211207114835.GA31153@kili \
--to=dan.carpenter@oracle.com \
--cc=elic@nvidia.com \
--cc=eperezma@redhat.com \
--cc=jasowang@redhat.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=mst@redhat.com \
--cc=parav@nvidia.com \
--cc=tiwei.bie@intel.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=xieyongji@bytedance.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox