Commit a388beb2 authored by Ma Ke's avatar Ma Ke Committed by Yongqiang Liu
Browse files

drm/client: fix null pointer dereference in drm_client_modeset_probe 

stable inclusion
from stable-v5.10.224
commit 5291d4f73452c91e8a11f71207617e3e234d418e
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAMM95
CVE: CVE-2024-43894

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



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

commit 113fd6372a5bb3689aba8ef5b8a265ed1529a78f upstream.

In drm_client_modeset_probe(), the return value of drm_mode_duplicate() is
assigned to modeset->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: cf13909a ("drm/fb-helper: Move out modeset config code")
Signed-off-by: default avatarMa Ke <make24@iscas.ac.cn>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240802044736.1570345-1-make24@iscas.ac.cn


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarYongqiang Liu <liuyongqiang13@huawei.com>
parent 52e62ae6

drivers/gpu/drm/drm_client_modeset.c

+5 −0
Original line number Diff line number Diff line
@@ -866,6 +866,11 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width, 


			kfree(modeset->mode);

			modeset->mode = drm_mode_duplicate(dev, mode);

			if (!modeset->mode) {

				ret = -ENOMEM;

				break;

			}



			drm_connector_get(connector);

			modeset->connectors[modeset->num_connectors++] = connector;

			modeset->x = offset->x;