lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 17/19] drm/radeon: fix a possible null pointer dereference
    Date
    From: Gong Yuanjun <ruc_gongyuanjun@163.com>

    [ Upstream commit a2b28708b645c5632dc93669ab06e97874c8244f ]

    In radeon_fp_native_mode(), the return value of drm_mode_duplicate()
    is assigned to mode, which will lead to a NULL pointer dereference
    on failure of drm_mode_duplicate(). Add a check to avoid npd.

    The failure status of drm_cvt_mode() on the other path is checked too.

    Signed-off-by: Gong Yuanjun <ruc_gongyuanjun@163.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/radeon/radeon_connectors.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
    index 9e6c2be0cc7d..a759955e3797 100644
    --- a/drivers/gpu/drm/radeon/radeon_connectors.c
    +++ b/drivers/gpu/drm/radeon/radeon_connectors.c
    @@ -489,6 +489,8 @@ static struct drm_display_mode *radeon_fp_native_mode(struct drm_encoder *encode
    native_mode->vdisplay != 0 &&
    native_mode->clock != 0) {
    mode = drm_mode_duplicate(dev, native_mode);
    + if (!mode)
    + return NULL;
    mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER;
    drm_mode_set_name(mode);

    @@ -503,6 +505,8 @@ static struct drm_display_mode *radeon_fp_native_mode(struct drm_encoder *encode
    * simpler.
    */
    mode = drm_cvt_mode(dev, native_mode->hdisplay, native_mode->vdisplay, 60, true, false, false);
    + if (!mode)
    + return NULL;
    mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER;
    DRM_DEBUG_KMS("Adding cvt approximation of native panel mode %s\n", mode->name);
    }
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-06-07 22:03    [W:4.313 / U:0.412 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site