lkml.org 
[lkml]   [2021]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 092/306] s390/cio: return -EFAULT if copy_to_user() fails again
    Date
    From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    From: Wang Qing <wangqing@vivo.com>

    commit 51c44babdc19aaf882e1213325a0ba291573308f upstream.

    The copy_to_user() function returns the number of bytes remaining to be
    copied, but we want to return -EFAULT if the copy doesn't complete.

    Fixes: e01bcdd61320 ("vfio: ccw: realize VFIO_DEVICE_GET_REGION_INFO ioctl")
    Signed-off-by: Wang Qing <wangqing@vivo.com>
    Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
    Link: https://lore.kernel.org/r/1614600093-13992-1-git-send-email-wangqing@vivo.com
    Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/s390/cio/vfio_ccw_ops.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/s390/cio/vfio_ccw_ops.c
    +++ b/drivers/s390/cio/vfio_ccw_ops.c
    @@ -543,7 +543,7 @@ static ssize_t vfio_ccw_mdev_ioctl(struc
    if (ret)
    return ret;

    - return copy_to_user((void __user *)arg, &info, minsz);
    + return copy_to_user((void __user *)arg, &info, minsz) ? -EFAULT : 0;
    }
    case VFIO_DEVICE_GET_REGION_INFO:
    {
    @@ -561,7 +561,7 @@ static ssize_t vfio_ccw_mdev_ioctl(struc
    if (ret)
    return ret;

    - return copy_to_user((void __user *)arg, &info, minsz);
    + return copy_to_user((void __user *)arg, &info, minsz) ? -EFAULT : 0;
    }
    case VFIO_DEVICE_GET_IRQ_INFO:
    {

    \
     
     \ /
      Last update: 2021-03-15 15:17    [W:2.084 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site