Commit 534ddad2 authored by Ma Ke's avatar Ma Ke Committed by Liu Mingrui
Browse files

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

stable inclusion
from stable-v5.10.221
commit 56fc4d3b0bdef691831cd95715a7ca3ebea98b2d
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAGEON
CVE: CVE-2024-41089

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=56fc4d3b0bdef691831cd95715a7ca3ebea98b2d



--------------------------------

commit 6d411c8ccc0137a612e0044489030a194ff5c843 upstream.

In nv17_tv_get_hd_modes(), the return value of drm_mode_duplicate() is
assigned to mode, which will lead to a possible NULL pointer dereference
on failure of drm_mode_duplicate(). The same applies to drm_cvt_mode().
Add a check to avoid null pointer dereference.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMa Ke <make24@iscas.ac.cn>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240625081029.2619437-1-make24@iscas.ac.cn


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLiu Mingrui <liumingrui@huawei.com>
parent d3937775

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... */