Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 000d5335 authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

sisfb: fix pseudo_palette array size and overrun 



- the pseudo_palette is only 16 elements long.
- do not write to the pseudo_palette if regno (array index) is more than 15.

Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c312f97d

drivers/video/sis/sis.h

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ struct sis_video_info { 
	struct fb_var_screeninfo default_var;



	struct fb_fix_screeninfo sisfb_fix;

	u32		pseudo_palette[17];

	u32		pseudo_palette[16];



	struct sisfb_monitor {

		u16 hmin;

drivers/video/sis/sis_main.c

+6 −0
Original line number Diff line number Diff line
@@ -1405,12 +1405,18 @@ sisfb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue, 
		}

		break;

	case 16:

		if (regno >= 16)

			break;



		((u32 *)(info->pseudo_palette))[regno] =

				(red & 0xf800)          |

				((green & 0xfc00) >> 5) |

				((blue & 0xf800) >> 11);

		break;

	case 32:

		if (regno >= 16)

			break;



		red >>= 8;

		green >>= 8;

		blue >>= 8;