From: Ma Ke Date: Thu, 18 Jul 2024 13:13:29 +0000 (+0800) Subject: drm/radeon: fix null pointer dereference in radeon_add_common_modes X-Git-Tag: microblaze-v6.13~18^2~21^2~382 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=7a38efeee6b59d0984ff0470d234a06fe6a7cf3c;p=linux-2.6-microblaze.git drm/radeon: fix null pointer dereference in radeon_add_common_modes In radeon_add_common_modes(), the return value of drm_cvt_mode() is assigned to mode, which will lead to a possible NULL pointer dereference on failure of drm_cvt_mode(). Add a check to avoid npd. Cc: stable@vger.kernel.org Fixes: d50ba256b5f1 ("drm/kms: start adding command line interface using fb.") Signed-off-by: Ma Ke Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index 69693ba5949e..880edabfc9e3 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -505,6 +505,9 @@ static void radeon_add_common_modes(struct drm_encoder *encoder, struct drm_conn continue; mode = drm_cvt_mode(dev, common_modes[i].w, common_modes[i].h, 60, false, false, false); + if (!mode) + continue; + drm_mode_probed_add(connector, mode); } }