diff mbox series

[2/2] sis_main: Fix strbuf array overflow

Message ID 20240927193424.3934247-1-shum.sdl@nppct.ru
State New
Headers show
Series None | expand

Commit Message

Andrey Shumilin Sept. 27, 2024, 7:34 p.m. UTC
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 <shum.sdl@nppct.ru>
---
 drivers/video/fbdev/sis/sis_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Helge Deller Sept. 27, 2024, 10:45 p.m. UTC | #1
On 9/27/24 21:34, Andrey Shumilin wrote:
> 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 <shum.sdl@nppct.ru>

applied to fbdev git tree.

Thanks!
Helge

> ---
>   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 03c736f6f3d0..e907fde96ff4 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 */
diff mbox series

Patch

diff --git a/drivers/video/fbdev/sis/sis_main.c b/drivers/video/fbdev/sis/sis_main.c
index 03c736f6f3d0..e907fde96ff4 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 */