lkml.org 
[lkml]   [2018]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 41/49] drm/armada: fix leak of crtc structure
    Date
    From: Russell King <rmk+kernel@armlinux.org.uk>

    [ Upstream commit 33cd3c07a976e11c3c4cc6b0b3db6760ad1590c5 ]

    Fix the leak of the CRTC structure in the failure paths of
    armada_drm_crtc_create().

    Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/gpu/drm/armada/armada_crtc.c | 25 +++++++++++++------------
    1 file changed, 13 insertions(+), 12 deletions(-)

    diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
    index a51f8cbcfe26..3137adf7b0af 100644
    --- a/drivers/gpu/drm/armada/armada_crtc.c
    +++ b/drivers/gpu/drm/armada/armada_crtc.c
    @@ -1178,17 +1178,13 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,

    ret = devm_request_irq(dev, irq, armada_drm_irq, 0, "armada_drm_crtc",
    dcrtc);
    - if (ret < 0) {
    - kfree(dcrtc);
    - return ret;
    - }
    + if (ret < 0)
    + goto err_crtc;

    if (dcrtc->variant->init) {
    ret = dcrtc->variant->init(dcrtc, dev);
    - if (ret) {
    - kfree(dcrtc);
    - return ret;
    - }
    + if (ret)
    + goto err_crtc;
    }

    /* Ensure AXI pipeline is enabled */
    @@ -1199,13 +1195,15 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,
    dcrtc->crtc.port = port;

    primary = kzalloc(sizeof(*primary), GFP_KERNEL);
    - if (!primary)
    - return -ENOMEM;
    + if (!primary) {
    + ret = -ENOMEM;
    + goto err_crtc;
    + }

    ret = armada_drm_plane_init(primary);
    if (ret) {
    kfree(primary);
    - return ret;
    + goto err_crtc;
    }

    ret = drm_universal_plane_init(drm, &primary->base, 0,
    @@ -1215,7 +1213,7 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,
    DRM_PLANE_TYPE_PRIMARY, NULL);
    if (ret) {
    kfree(primary);
    - return ret;
    + goto err_crtc;
    }

    ret = drm_crtc_init_with_planes(drm, &dcrtc->crtc, &primary->base, NULL,
    @@ -1234,6 +1232,9 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,

    err_crtc_init:
    primary->base.funcs->destroy(&primary->base);
    +err_crtc:
    + kfree(dcrtc);
    +
    return ret;
    }

    --
    2.11.0
    \
     
     \ /
      Last update: 2018-01-28 23:47    [W:3.051 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site