From 5da76581e4f2dd21ce82f7f68d5264d7e0ed1690 Mon Sep 17 00:00:00 2001 From: Andrey Shumilin Date: Thu, 21 Nov 2024 01:48:26 +0000 Subject: [PATCH] fbdev: sisfb: Fix strbuf array overflow stable inclusion from stable-v5.10.227 commit 252f147b1826cbb30ae0304cf86b66d3bb12b743 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB2YVH CVE: CVE-2024-50180 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=252f147b1826cbb30ae0304cf86b66d3bb12b743 -------------------------------- [ Upstream commit 9cf14f5a2746c19455ce9cb44341b5527b5e19c3 ] The values of the variables xres and yres are placed in strbuf. These variables are obtained from strbuf1. The strbuf1 array contains digit characters and a space if the array contains non-digit characters. Then, when executing sprintf(strbuf, "%ux%ux8", xres, yres); more than 16 bytes will be written to strbuf. It is suggested to increase the size of the strbuf array to 24. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Andrey Shumilin Signed-off-by: Helge Deller Signed-off-by: Sasha Levin Signed-off-by: Yi Yang --- drivers/video/fbdev/sis/sis_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/sis/sis_main.c b/drivers/video/fbdev/sis/sis_main.c index e540cb0c5172..7787fd21932c 100644 --- a/drivers/video/fbdev/sis/sis_main.c +++ b/drivers/video/fbdev/sis/sis_main.c @@ -183,7 +183,7 @@ static void sisfb_search_mode(char *name, bool quiet) { unsigned int j = 0, xres = 0, yres = 0, depth = 0, rate = 0; int i = 0; - char strbuf[16], strbuf1[20]; + char strbuf[24], strbuf1[20]; char *nameptr = name; /* We don't know the hardware specs yet and there is no ivideo */ -- Gitee