Commit ab0f78eb authored by Yang Yingliang's avatar Yang Yingliang
Browse files

drm/radeon: check the alloc_workqueue return value in radeon_crtc_init() 

mainline inclusion
from mainline-v6.8-rc1
commit 7a2464fac80d42f6f8819fed97a553e9c2f43310
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8T5EB
CVE: CVE-2019-16230

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7a2464fac80d42f6f8819fed97a553e9c2f43310



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

check the alloc_workqueue return value in radeon_crtc_init()
to avoid null-ptr-deref.

Fixes: fa7f517c ("drm/radeon: rework page flip handling v4")
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5adc926f

drivers/gpu/drm/radeon/radeon_display.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -687,11 +687,16 @@ static void radeon_crtc_init(struct drm_device *dev, int index) 
	if (radeon_crtc == NULL)

	if (radeon_crtc == NULL)

		return;

		return;





	radeon_crtc->flip_queue = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0);

	if (!radeon_crtc->flip_queue) {

		kfree(radeon_crtc);

		return;

	}



	drm_crtc_init(dev, &radeon_crtc->base, &radeon_crtc_funcs);

	drm_crtc_init(dev, &radeon_crtc->base, &radeon_crtc_funcs);





	drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256);

	drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256);

	radeon_crtc->crtc_id = index;

	radeon_crtc->crtc_id = index;

	radeon_crtc->flip_queue = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0);

	rdev->mode_info.crtcs[index] = radeon_crtc;

	rdev->mode_info.crtcs[index] = radeon_crtc;





	if (rdev->family >= CHIP_BONAIRE) {

	if (rdev->family >= CHIP_BONAIRE) {