leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sisfb: fix pseudo_palette array size and overrun

Browse Source 
- 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: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Antonino A. Daplas 2007-07-17 04:05:44 -07:00 committed by Linus Torvalds
parent c312f97df6
commit 000d5335c6
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/sis/sis.h
View File

@ -479,7 +479,7 @@ struct sis_video_info {
struct fb_var_screeninfo default_var; struct fb_var_screeninfo default_var;
struct fb_fix_screeninfo sisfb_fix; struct fb_fix_screeninfo sisfb_fix;
u32 pseudo_palette[17]; u32 pseudo_palette[16];
struct sisfb_monitor { struct sisfb_monitor {
u16 hmin; u16 hmin;

6
drivers/video/sis/sis_main.c
View File

@ -1405,12 +1405,18 @@ sisfb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue,
} }
break; break;
case 16: case 16:
if (regno >= 16)
break;
((u32 *)(info->pseudo_palette))[regno] = ((u32 *)(info->pseudo_palette))[regno] =
(red & 0xf800) | (red & 0xf800) |
((green & 0xfc00) >> 5) | ((green & 0xfc00) >> 5) |
((blue & 0xf800) >> 11); ((blue & 0xf800) >> 11);
break; break;
case 32: case 32:
if (regno >= 16)
break;
red >>= 8; red >>= 8;
green >>= 8; green >>= 8;
blue >>= 8; blue >>= 8;