Skip to content

Commit

Permalink
drm/radeon: fix null pointer dereference in radeon_add_common_modes
Browse files Browse the repository at this point in the history
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: d50ba25 ("drm/kms: start adding command line interface using fb.")
Signed-off-by: Ma Ke <make24@iscas.ac.cn>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Ma Ke authored and Alex Deucher committed Jul 23, 2024
1 parent a7e8467 commit 7a38efe
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/radeon/radeon_connectors.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down

0 comments on commit 7a38efe

Please sign in to comment.