From: Dan Carpenter <dan.carpenter@oracle.com>
To: Alex Williamson <alex.williamson@redhat.com>
Cc: Eric Auger <eric.auger@linaro.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
Baptiste Reynal <b.reynal@virtualopensystems.com>,
Antonios Motakis <a.motakis@virtualopensystems.com>,
kvm@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] vfio/pci: return -EFAULT if copy_to_user fails
Date: Thu, 25 Feb 2016 07:52:12 +0000 [thread overview]
Message-ID: <20160225075212.GD7333@mwanda> (raw)
The copy_to_user() function returns the number of bytes that were not
copied but we want to return -EFAULT on error here.
Fixes: 188ad9d6cbbc ('vfio/pci: Include sparse mmap capability for MSI-X table regions')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index 1ce1d36..98059df 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -664,12 +664,11 @@ static long vfio_pci_ioctl(void *device_data,
info.cap_offset = 0;
} else {
vfio_info_cap_shift(&caps, sizeof(info));
- ret = copy_to_user((void __user *)arg +
- sizeof(info), caps.buf,
- caps.size);
- if (ret) {
+ if (copy_to_user((void __user *)arg +
+ sizeof(info), caps.buf,
+ caps.size)) {
kfree(caps.buf);
- return ret;
+ return -EFAULT;
}
info.cap_offset = sizeof(info);
}
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Alex Williamson <alex.williamson@redhat.com>
Cc: Eric Auger <eric.auger@linaro.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
Baptiste Reynal <b.reynal@virtualopensystems.com>,
Antonios Motakis <a.motakis@virtualopensystems.com>,
kvm@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] vfio/pci: return -EFAULT if copy_to_user fails
Date: Thu, 25 Feb 2016 10:52:12 +0300 [thread overview]
Message-ID: <20160225075212.GD7333@mwanda> (raw)
The copy_to_user() function returns the number of bytes that were not
copied but we want to return -EFAULT on error here.
Fixes: 188ad9d6cbbc ('vfio/pci: Include sparse mmap capability for MSI-X table regions')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index 1ce1d36..98059df 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -664,12 +664,11 @@ static long vfio_pci_ioctl(void *device_data,
info.cap_offset = 0;
} else {
vfio_info_cap_shift(&caps, sizeof(info));
- ret = copy_to_user((void __user *)arg +
- sizeof(info), caps.buf,
- caps.size);
- if (ret) {
+ if (copy_to_user((void __user *)arg +
+ sizeof(info), caps.buf,
+ caps.size)) {
kfree(caps.buf);
- return ret;
+ return -EFAULT;
}
info.cap_offset = sizeof(info);
}
next reply other threads:[~2016-02-25 7:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-25 7:52 Dan Carpenter [this message]
2016-02-25 7:52 ` [patch] vfio/pci: return -EFAULT if copy_to_user fails Dan Carpenter
2016-02-25 9:28 ` Michael S. Tsirkin
2016-02-25 9:28 ` Michael S. Tsirkin
2016-02-25 11:09 ` Dan Carpenter
2016-02-25 11:09 ` Dan Carpenter
2016-02-25 11:33 ` Michael S. Tsirkin
2016-02-25 11:33 ` Michael S. Tsirkin
2016-02-25 11:34 ` Michael S. Tsirkin
2016-02-25 11:34 ` Michael S. Tsirkin
2016-02-28 14:05 ` Alex Williamson
2016-02-28 14:05 ` Alex Williamson
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=20160225075212.GD7333@mwanda \
--to=dan.carpenter@oracle.com \
--cc=a.motakis@virtualopensystems.com \
--cc=alex.williamson@redhat.com \
--cc=b.reynal@virtualopensystems.com \
--cc=eric.auger@linaro.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=mst@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.