From: Alex Williamson <alex.williamson@redhat.com>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
Baptiste Reynal <b.reynal@virtualopensystems.com>,
Antonios Motakis <a.motakis@virtualopensystems.com>,
Eric Auger <eric.auger@linaro.org>,
Julia Lawall <Julia.Lawall@lip6.fr>,
kvm@vger.kernel.org
Subject: Re: [PATCH v2 for-4.5] vfio: fix ioctl error handling
Date: Sun, 28 Feb 2016 08:23:36 -0600 [thread overview]
Message-ID: <20160228082336.721d97f8@ul30vt.home> (raw)
In-Reply-To: <1456667344-27786-1-git-send-email-mst@redhat.com>
On Sun, 28 Feb 2016 15:51:49 +0200
"Michael S. Tsirkin" <mst@redhat.com> wrote:
> Calling return copy_to_user(...) in an ioctl will not
> do the right thing if there's a pagefault:
> copy_to_user returns the number of bytes not copied
> in this case.
>
> Fix up vfio to do
> if (copy_to_user(...))
> return -EFAULT;
> return 0;
>
> everywhere.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>
> Changes from v1:
> fix up good path logic to return 0.
>
> Compiled only.
>
> drivers/vfio/pci/vfio_pci.c | 12 +++++++++---
> drivers/vfio/platform/vfio_platform_common.c | 12 +++++++++---
> drivers/vfio/vfio_iommu_type1.c | 8 ++++++--
> 3 files changed, 24 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
> index 2760a7b..286b91f 100644
> --- a/drivers/vfio/pci/vfio_pci.c
> +++ b/drivers/vfio/pci/vfio_pci.c
> @@ -446,7 +446,9 @@ static long vfio_pci_ioctl(void *device_data,
> info.num_regions = VFIO_PCI_NUM_REGIONS;
> info.num_irqs = VFIO_PCI_NUM_IRQS;
>
> - return copy_to_user((void __user *)arg, &info, minsz);
> + if (copy_to_user((void __user *)arg, &info, minsz))
> + return -EFAULT;
> + return 0;
Any objection to a ternary in each case?
return copy_to_user((void __user *)arg,
&info, minsz) ? -EFAULT : 0;
next prev parent reply other threads:[~2016-02-28 14:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-28 13:51 [PATCH v2 for-4.5] vfio: fix ioctl error handling Michael S. Tsirkin
2016-02-28 14:23 ` Alex Williamson [this message]
2016-02-28 14:25 ` Michael S. Tsirkin
2016-02-28 14:33 ` Alex Williamson
2016-02-28 14:55 ` Michael S. Tsirkin
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=20160228082336.721d97f8@ul30vt.home \
--to=alex.williamson@redhat.com \
--cc=Julia.Lawall@lip6.fr \
--cc=a.motakis@virtualopensystems.com \
--cc=b.reynal@virtualopensystems.com \
--cc=eric.auger@linaro.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=stable@vger.kernel.org \
/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.