lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 416/663] vfio-pci/zdev: fix possible segmentation fault issue
    Date
    From: Max Gurtovoy <mgurtovoy@nvidia.com>

    [ Upstream commit 7e31d6dc2c78b2a0ba0039ca97ca98a581e8db82 ]

    In case allocation fails, we must behave correctly and exit with error.

    Fixes: e6b817d4b821 ("vfio-pci/zdev: Add zPCI capabilities to VFIO_DEVICE_GET_INFO")
    Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com>
    Reviewed-by: Cornelia Huck <cohuck@redhat.com>
    Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
    Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/vfio/pci/vfio_pci_zdev.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/vfio/pci/vfio_pci_zdev.c b/drivers/vfio/pci/vfio_pci_zdev.c
    index 2296856340311..1bb7edac56899 100644
    --- a/drivers/vfio/pci/vfio_pci_zdev.c
    +++ b/drivers/vfio/pci/vfio_pci_zdev.c
    @@ -74,6 +74,8 @@ static int zpci_util_cap(struct zpci_dev *zdev, struct vfio_pci_device *vdev,
    int ret;

    cap = kmalloc(cap_size, GFP_KERNEL);
    + if (!cap)
    + return -ENOMEM;

    cap->header.id = VFIO_DEVICE_INFO_CAP_ZPCI_UTIL;
    cap->header.version = 1;
    @@ -98,6 +100,8 @@ static int zpci_pfip_cap(struct zpci_dev *zdev, struct vfio_pci_device *vdev,
    int ret;

    cap = kmalloc(cap_size, GFP_KERNEL);
    + if (!cap)
    + return -ENOMEM;

    cap->header.id = VFIO_DEVICE_INFO_CAP_ZPCI_PFIP;
    cap->header.version = 1;
    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-02 01:11    [W:2.240 / U:1.972 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site