aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/mem.c
diff options
context:
space:
mode:
authorGuillaume Chazarain <guichaz@yahoo.fr>2006-01-08 04:02:43 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-08 23:13:53 -0500
commitcd140a5c1f456f50897af4a2e9a23d228a5fe719 (patch)
tree24170cf30ce2c5d3129c9b535942c4c52231a042 /drivers/char/mem.c
parent025510cd20f4c35c3958bea133d96c9bd7c6ef9e (diff)
[PATCH] kmsg_write: don't return printk return value
kmsg_write returns with printk, so some programs may be confused by a successful write() with a return value different than the buffer length. # /bin/echo something > /dev/kmsg /bin/echo: write error: Inappropriate ioctl for device The drawbacks is that the printk return value can no more be quickly checked from userspace. Signed-off-by: Guillaume Chazarain <guichaz@yahoo.fr> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/mem.c')
-rw-r--r--drivers/char/mem.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 91dd669273e0..a85f3a361442 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -817,7 +817,7 @@ static ssize_t kmsg_write(struct file * file, const char __user * buf,
817 size_t count, loff_t *ppos) 817 size_t count, loff_t *ppos)
818{ 818{
819 char *tmp; 819 char *tmp;
820 int ret; 820 ssize_t ret;
821 821
822 tmp = kmalloc(count + 1, GFP_KERNEL); 822 tmp = kmalloc(count + 1, GFP_KERNEL);
823 if (tmp == NULL) 823 if (tmp == NULL)
@@ -826,6 +826,9 @@ static ssize_t kmsg_write(struct file * file, const char __user * buf,
826 if (!copy_from_user(tmp, buf, count)) { 826 if (!copy_from_user(tmp, buf, count)) {
827 tmp[count] = 0; 827 tmp[count] = 0;
828 ret = printk("%s", tmp); 828 ret = printk("%s", tmp);
829 if (ret > count)
830 /* printk can add a prefix */
831 ret = count;
829 } 832 }
830 kfree(tmp); 833 kfree(tmp);
831 return ret; 834 return ret;