linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 11/24] pvr2fb: Fix pseudo_palette array overrun and typecast
@ 2007-06-02 10:00 Antonino A. Daplas
  2007-06-03 23:25 ` Paul Mundt
  0 siblings, 1 reply; 2+ messages in thread
From: Antonino A. Daplas @ 2007-06-02 10:00 UTC (permalink / raw)
  To: Andrew Morton; +Cc: Paul Mundt, Linux Fbdev development list

- the pseudo_palette has only 16 elements. Do not write if regno (the array
  index) is more than 15.
- if using generic drawing libraries, the typecast of pseudo_palette is 
  always u32 *

Signed-off-by: Antonino Daplas <adaplas@gmail.com>
---

 drivers/video/pvr2fb.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index df2909a..0af90e0 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -337,24 +337,25 @@ static int pvr2fb_setcolreg(unsigned int
 		      ((blue  & 0xf800) >> 11);
 
 		pvr2fb_set_pal_entry(par, regno, tmp);
-		((u16*)(info->pseudo_palette))[regno] = tmp;
 		break;
 	    case 24: /* RGB 888 */
 		red >>= 8; green >>= 8; blue >>= 8;
-		((u32*)(info->pseudo_palette))[regno] = (red << 16) | (green << 8) | blue;
+		tmp = (red << 16) | (green << 8) | blue;
 		break;
 	    case 32: /* ARGB 8888 */
 		red >>= 8; green >>= 8; blue >>= 8;
 		tmp = (transp << 24) | (red << 16) | (green << 8) | blue;
 
 		pvr2fb_set_pal_entry(par, regno, tmp);
-		((u32*)(info->pseudo_palette))[regno] = tmp;
 		break;
 	    default:
 		pr_debug("Invalid bit depth %d?!?\n", info->var.bits_per_pixel);
 		return 1;
 	}
 
+	if (regno < 16)
+		((u32*)(info->pseudo_palette))[regno] = tmp;
+
 	return 0;
 }
 


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 11/24] pvr2fb: Fix pseudo_palette array overrun and typecast
  2007-06-02 10:00 [PATCH 11/24] pvr2fb: Fix pseudo_palette array overrun and typecast Antonino A. Daplas
@ 2007-06-03 23:25 ` Paul Mundt
  0 siblings, 0 replies; 2+ messages in thread
From: Paul Mundt @ 2007-06-03 23:25 UTC (permalink / raw)
  To: Antonino A. Daplas; +Cc: Andrew Morton, Linux Fbdev development list

On Sat, Jun 02, 2007 at 06:00:30PM +0800, Antonino A. Daplas wrote:
> - the pseudo_palette has only 16 elements. Do not write if regno (the array
>   index) is more than 15.
> - if using generic drawing libraries, the typecast of pseudo_palette is 
>   always u32 *
> 
> Signed-off-by: Antonino Daplas <adaplas@gmail.com>

Acked-by: Paul Mundt <lethal@linux-sh.org>

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-06-03 23:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-02 10:00 [PATCH 11/24] pvr2fb: Fix pseudo_palette array overrun and typecast Antonino A. Daplas
2007-06-03 23:25 ` Paul Mundt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).