From: "Michael S. Tsirkin" <mst@redhat.com>
To: Alex Williamson <alex.williamson@redhat.com>
Cc: linux-kernel@vger.kernel.org,
Dan Carpenter <dan.carpenter@oracle.com>,
stable@vger.kernel.org,
Baptiste Reynal <b.reynal@virtualopensystems.com>,
Eric Auger <eric.auger@linaro.org>,
Antonios Motakis <a.motakis@virtualopensystems.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
kvm@vger.kernel.org
Subject: Re: [PATCH for-4.5] vfio: fix ioctl error handling
Date: Sun, 28 Feb 2016 16:10:32 +0200 [thread overview]
Message-ID: <20160228160958-mutt-send-email-mst@redhat.com> (raw)
In-Reply-To: <20160228072322.25154cf4@ul30vt.home>
On Sun, Feb 28, 2016 at 07:23:22AM -0600, Alex Williamson wrote:
> On Thu, 25 Feb 2016 13:34:43 +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;
> >
> > everywhere.
> >
> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> > drivers/vfio/pci/vfio_pci.c | 9 ++++++---
> > drivers/vfio/platform/vfio_platform_common.c | 9 ++++++---
> > drivers/vfio/vfio_iommu_type1.c | 6 ++++--
> > 3 files changed, 16 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
> > index 2760a7b..27a727a 100644
> > --- a/drivers/vfio/pci/vfio_pci.c
> > +++ b/drivers/vfio/pci/vfio_pci.c
> > @@ -446,7 +446,8 @@ 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;
>
> Ok, but where do we return 0 on success now?
Ouch. Thanks for pointing this out. Fixed in v2.
--
MST
prev parent reply other threads:[~2016-02-28 14:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-25 11:34 [PATCH for-4.5] vfio: fix ioctl error handling Michael S. Tsirkin
2016-02-26 13:47 ` Dan Carpenter
2016-02-28 13:23 ` Alex Williamson
2016-02-28 14:10 ` Michael S. Tsirkin [this message]
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=20160228160958-mutt-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=Julia.Lawall@lip6.fr \
--cc=a.motakis@virtualopensystems.com \
--cc=alex.williamson@redhat.com \
--cc=b.reynal@virtualopensystems.com \
--cc=dan.carpenter@oracle.com \
--cc=eric.auger@linaro.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox