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

Commit 2f390380 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds
Browse files

fbdev: add palette register check to several drivers 



Add check if palette register number is in correct range for few drivers
which miss it.  The regno value comes indirectly from user space.

Two drivers has converted check from BUG_ON() macro to just return an
error (non-zero value).

Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2cb96f86

drivers/video/atafb.c

+3 −0
Original line number Diff line number Diff line
@@ -2245,6 +2245,9 @@ static int ext_setcolreg(unsigned int regno, unsigned int red, 
	if (regno > 255)

		return 1;



	if (regno > 255)

		return 1;



	switch (external_card_type) {

	case IS_VGA:

		OUTB(0x3c8, regno);

drivers/video/ep93xx-fb.c

+2 −0
Original line number Diff line number Diff line
@@ -358,6 +358,8 @@ static int ep93xxfb_setcolreg(unsigned int regno, unsigned int red, 


	switch (info->fix.visual) {

	case FB_VISUAL_PSEUDOCOLOR:

		if (regno > 255)

			return 1;

		rgb = ((red & 0xff00) << 8) | (green & 0xff00) |

			((blue & 0xff00) >> 8);

drivers/video/maxinefb.c

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ static int maxinefb_setcolreg(unsigned regno, unsigned red, unsigned green, 
	/* value to be written into the palette reg. */

	unsigned long hw_colorvalue = 0;



	if (regno > 255)

		return 1;



	red   >>= 8;    /* The cmap fields are 16 bits    */

	green >>= 8;    /* wide, but the harware colormap */

	blue  >>= 8;    /* registers are only 8 bits wide */

drivers/video/pmag-ba-fb.c

+2 −1
Original line number Diff line number Diff line
@@ -98,7 +98,8 @@ static int pmagbafb_setcolreg(unsigned int regno, unsigned int red, 
{

	struct pmagbafb_par *par = info->par;



	BUG_ON(regno >= info->cmap.len);

	if (regno >= info->cmap.len)

		return 1;



	red   >>= 8;	/* The cmap fields are 16 bits    */

	green >>= 8;	/* wide, but the hardware colormap */

drivers/video/pmagb-b-fb.c

+2 −1
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ static int pmagbbfb_setcolreg(unsigned int regno, unsigned int red, 
{

	struct pmagbbfb_par *par = info->par;



	BUG_ON(regno >= info->cmap.len);

	if (regno >= info->cmap.len)

		return 1;



	red   >>= 8;	/* The cmap fields are 16 bits    */

	green >>= 8;	/* wide, but the hardware colormap */