Commit c69f2fb9 authored by Ma Ke's avatar Ma Ke Committed by Zeng Heng
Browse files

drm/gma500: fix null pointer dereference in psb_intel_lvds_get_modes 

mainline inclusion
from mainline-v6.11-rc1
commit 2df7aac81070987b0f052985856aa325a38debf6
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAKPWK
CVE: CVE-2024-42309

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



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

In psb_intel_lvds_get_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(). Add a check to avoid npd.

Cc: stable@vger.kernel.org
Fixes: 89c78134 ("gma500: Add Poulsbo support")
Signed-off-by: default avatarMa Ke <make24@iscas.ac.cn>
Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240709092011.3204970-1-make24@iscas.ac.cn


Signed-off-by: default avatarZeng Heng <zengheng4@huawei.com>
parent feb0fe58

drivers/gpu/drm/gma500/psb_intel_lvds.c

+3 −0
Original line number Diff line number Diff line
@@ -508,6 +508,9 @@ static int psb_intel_lvds_get_modes(struct drm_connector *connector) 
	if (mode_dev->panel_fixed_mode != NULL) {

		struct drm_display_mode *mode =

		    drm_mode_duplicate(dev, mode_dev->panel_fixed_mode);

		if (!mode)

			return 0;



		drm_mode_probed_add(connector, mode);

		return 1;

	}