Unverified Commit b97eaf84 authored Aug 05, 2024 by openeuler-ci-bot Committed by Gitee Aug 05, 2024

!10598 drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_hd_modes

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Mingrui <liumingrui@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/SYRE5MPALTGKPTCXEFUPSSUYP7OAGSOO/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGEON 
 
Link:https://gitee.com/openeuler/kernel/pulls/10598

 

Reviewed-by: Zhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

parents cf320507 534ddad2

drivers/gpu/drm/nouveau/dispnv04/tvnv17.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -257,6 +257,8 @@ static int nv17_tv_get_hd_modes(struct drm_encoder *encoder,
		if (modes[i].hdisplay == output_mode->hdisplay &&
		modes[i].vdisplay == output_mode->vdisplay) {
		mode = drm_mode_duplicate(encoder->dev, output_mode);
		if (!mode)
		continue;
		mode->type \|= DRM_MODE_TYPE_PREFERRED;

		} else {
		@@ -264,6 +266,8 @@ static int nv17_tv_get_hd_modes(struct drm_encoder *encoder,
		modes[i].vdisplay, 60, false,
		(output_mode->flags &
		DRM_MODE_FLAG_INTERLACE), false);
		if (!mode)
		continue;
		}

		/* CVT modes are sometimes unsuitable... */