Unverified Commit a49ad97c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7979 drm/radeon: fix a possible null pointer dereference 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Chuang <liuchuang40@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/NKMJ3YPJIBIIEVZJB5O7N676ZYYVVS5R/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9R4KL 
 
Link:https://gitee.com/openeuler/kernel/pulls/7979

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 3ad30713 6ad42dad

drivers/gpu/drm/radeon/radeon_connectors.c

+4 −0
Original line number Diff line number Diff line
@@ -476,6 +476,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);
@@ -490,6 +492,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);

	}