Commit d524d9ea authored by Dan Carpenter's avatar Dan Carpenter Committed by dinglongwei
Browse files

firmware/sysfb: fix an error code in sysfb_init() 

mainline inclusion
from mainline-v6.9-rc1
commit 9fa2679b7fe1bf4e6010051767d3c163b3aee68b
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAR4KI
CVE: CVE-2024-46698

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



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

This error path accidentally returns success when it should preserve the
error code from sysfb_parent_dev().

Fixes: 4e754597d603 ("firmware/sysfb: Create firmware device only for enabled PCI devices")
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/aaaa2e13-849b-41a0-8186-25f3d2a16f86@moroto.mountain


Signed-off-by: default avatardinglongwei <dinglongwei1@huawei.com>
parent 3cf5db3a

drivers/firmware/sysfb.c

+3 −1
Original line number Diff line number Diff line
@@ -134,8 +134,10 @@ static __init int sysfb_init(void) 
	sysfb_apply_efi_quirks();



	parent = sysfb_parent_dev(si);

	if (IS_ERR(parent))

	if (IS_ERR(parent)) {

		ret = PTR_ERR(parent);

		goto unlock_mutex;

	}



	/* try to create a simple-framebuffer device */

	compatible = sysfb_parse_mode(si, &mode);