lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fbdev: hecubafb bugfix

Browse Source 
This patch is a bugfix for hecubafb_write which would return an incorrect
error value for the bytecount from framebuffer writes.

Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jaya Kumar
2008-04-28 02:15:37 -07:00
committed by Linus Torvalds
parent 555514fabc
commit 963654a9c9
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/video/hecubafb.c
View File

@@ -270,41 +270,43 @@ static void hecubafb_imageblit(struct fb_info *info,
static ssize_t hecubafb_write(struct fb_info *info, const char __user *buf, static ssize_t hecubafb_write(struct fb_info *info, const char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
unsigned long p; struct hecubafb_par *par = info->par;
int err=-EINVAL; unsigned long p = *ppos;
struct hecubafb_par *par; void *dst;
unsigned int xres; int err = 0;
unsigned int fbmemlength; unsigned long total_size;
p = *ppos; if (info->state != FBINFO_STATE_RUNNING)
par = info->par; return -EPERM;
xres = info->var.xres;
fbmemlength = (xres * info->var.yres)/8;
if (p > fbmemlength) total_size = info->fix.smem_len;
return -ENOSPC;
err = 0; if (p > total_size)
if ((count + p) > fbmemlength) { return -EFBIG;
count = fbmemlength - p;
if (count > total_size) {
err = -EFBIG;
count = total_size;
}
if (count + p > total_size) {
if (!err)
err = -ENOSPC; err = -ENOSPC;
count = total_size - p;
} }
if (count) { dst = (void __force *) (info->screen_base + p);
char *base_addr;
base_addr = (char __force *)info->screen_base; if (copy_from_user(dst, buf, count))
count -= copy_from_user(base_addr + p, buf, count);
*ppos += count;
err = -EFAULT; err = -EFAULT;
}
if (!err)
*ppos += count;
hecubafb_dpy_update(par); hecubafb_dpy_update(par);
if (count) return (err) ? err : count;
return count;
return err;
} }
static struct fb_ops hecubafb_ops = { static struct fb_ops hecubafb_ops = {