pxafb: only take some fields of var in pxafb_pan_display()
PATCH 1/1 pxafb: only take some fields of var in pxafb_pan_display()
Commit 3a8552e made pxafb pay attention to paramters passed to pxafb_pan_display(). As Ville Syrj?l? pointed out, this is potentially dangerous as user could pass in any other screeninfo parameters as well, and not only such that are relevant for display panning.
This patch fixed that by limiting the arguments actually used to .xoffset, .yoffset and .vmode & FB_VMODE_YWRAP.
Signed-off-by Daniel Mack <[email protected]>
Cc Ville Syrj?l? <[email protected]>
Cc Eric Miao <[email protected]>
Cc Sven Neumann <[email protected]>
--- drivers/video/pxafb.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)
drivers/video/pxafb.c +10 -1
@@ -532,12 +532,21 @@ static int pxafb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) {struct pxafb_info *fbi = (struct pxafb_info *)info; +struct fb_var_screeninfo newvar;int dma =DMA_MAX +DMA_BASE ;if (fbi->state !=C_ENABLE )return 0 ; -setup_base_frame (fbi, var,1 ); +/* Only take .xoffset, .yoffset and .vmode & FB_VMODE_YWRAP from what +* was passed in and copy the rest from the old screeninfo. */ +memcpy (&newvar, &fbi->fb.var,sizeof (newvar)); + newvar.xoffset = var->xoffset; + newvar.yoffset = var->yoffset; + newvar.vmode &= ~FB_VMODE_YWRAP ; + newvar.vmode |= var->vmode &FB_VMODE_YWRAP ; + +setup_base_frame (fbi, &newvar,1 );if (fbi->lccr0 &LCCR0_SDS )lcd_writel (fbi,FBR1 , fbi->fdadr[dma +1 ] |0x1 );
Signature · 1 line
1.6.5