The patch titled
fbdev: Fix return error of fb_write
has been added to the -mm tree. Its filename is
fbdev-fix-return-error-of-fb_write.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: "Antonino A. Daplas" <adaplas@xxxxxxxxx>
Fix return code of fb_write():
If at least 1 byte was transferred to the device, return number of bytes,
otherwise:
- return -EFBIG - if file offset is past the maximum allowable offset or
size is greater than framebuffer length
- return -ENOSPC - if size is greater than framebuffer length - offset
Signed-off-by: Antonino Daplas <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/video/fbmem.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff -puN drivers/video/fbmem.c~fbdev-fix-return-error-of-fb_write drivers/video/fbmem.c
--- devel/drivers/video/fbmem.c~fbdev-fix-return-error-of-fb_write 2006-04-14 22:53:30.000000000 -0700
+++ devel-akpm/drivers/video/fbmem.c 2006-04-14 22:53:30.000000000 -0700
@@ -674,13 +674,19 @@ fb_write(struct file *file, const char _
total_size = info->fix.smem_len;
if (p > total_size)
- return 0;
+ return -EFBIG;
- if (count >= total_size)
+ if (count > total_size) {
+ err = -EFBIG;
count = total_size;
+ }
+
+ if (count + p > total_size) {
+ if (!err)
+ err = -ENOSPC;
- if (count + p > total_size)
count = total_size - p;
+ }
buffer = kmalloc((count > PAGE_SIZE) ? PAGE_SIZE : count,
GFP_KERNEL);
@@ -722,7 +728,7 @@ fb_write(struct file *file, const char _
kfree(buffer);
- return (err) ? err : cnt;
+ return (cnt) ? cnt : err;
}
#ifdef CONFIG_KMOD
_
Patches currently in -mm which might be from adaplas@xxxxxxxxx are
origin.patch
fbdev-fix-return-error-of-fb_write.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
