lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 484/563] drm/radeon: fix error handling in radeon_driver_open_kms
    Date
    From: Christian König <christian.koenig@amd.com>

    commit 4722f463896cc0ef1a6f1c3cb2e171e949831249 upstream.

    The return value was never initialized so the cleanup code executed when
    it isn't even necessary.

    Just add proper error handling.

    Fixes: ab50cb9df889 ("drm/radeon/radeon_kms: Fix a NULL pointer dereference in radeon_driver_open_kms()")
    Signed-off-by: Christian König <christian.koenig@amd.com>
    Tested-by: Jan Stancek <jstancek@redhat.com>
    Tested-by: Borislav Petkov <bp@suse.de>
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/radeon/radeon_kms.c | 22 ++++++++++++----------
    1 file changed, 12 insertions(+), 10 deletions(-)

    --- a/drivers/gpu/drm/radeon/radeon_kms.c
    +++ b/drivers/gpu/drm/radeon/radeon_kms.c
    @@ -652,18 +652,18 @@ int radeon_driver_open_kms(struct drm_de
    fpriv = kzalloc(sizeof(*fpriv), GFP_KERNEL);
    if (unlikely(!fpriv)) {
    r = -ENOMEM;
    - goto out_suspend;
    + goto err_suspend;
    }

    if (rdev->accel_working) {
    vm = &fpriv->vm;
    r = radeon_vm_init(rdev, vm);
    if (r)
    - goto out_fpriv;
    + goto err_fpriv;

    r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);
    if (r)
    - goto out_vm_fini;
    + goto err_vm_fini;

    /* map the ib pool buffer read only into
    * virtual address space */
    @@ -671,7 +671,7 @@ int radeon_driver_open_kms(struct drm_de
    rdev->ring_tmp_bo.bo);
    if (!vm->ib_bo_va) {
    r = -ENOMEM;
    - goto out_vm_fini;
    + goto err_vm_fini;
    }

    r = radeon_vm_bo_set_addr(rdev, vm->ib_bo_va,
    @@ -679,19 +679,21 @@ int radeon_driver_open_kms(struct drm_de
    RADEON_VM_PAGE_READABLE |
    RADEON_VM_PAGE_SNOOPED);
    if (r)
    - goto out_vm_fini;
    + goto err_vm_fini;
    }
    file_priv->driver_priv = fpriv;
    }

    - if (!r)
    - goto out_suspend;
    + pm_runtime_mark_last_busy(dev->dev);
    + pm_runtime_put_autosuspend(dev->dev);
    + return 0;

    -out_vm_fini:
    +err_vm_fini:
    radeon_vm_fini(rdev, vm);
    -out_fpriv:
    +err_fpriv:
    kfree(fpriv);
    -out_suspend:
    +
    +err_suspend:
    pm_runtime_mark_last_busy(dev->dev);
    pm_runtime_put_autosuspend(dev->dev);
    return r;

    \
     
     \ /
      Last update: 2022-01-25 04:40    [W:4.831 / U:0.336 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site