diff -r d18e06f9c571 drivers/char/mem.c --- a/drivers/char/mem.c Mon Nov 14 10:22:49 2005 +0800 +++ b/drivers/char/mem.c Mon Nov 14 15:03:06 2005 +0100 @@ -817,7 +817,7 @@ size_t count, loff_t *ppos) { char *tmp; - int ret; + ssize_t ret; tmp = kmalloc(count + 1, GFP_KERNEL); if (tmp == NULL) @@ -826,6 +826,9 @@ if (!copy_from_user(tmp, buf, count)) { tmp[count] = 0; ret = printk("%s", tmp); + if (ret > count) + /* printk can add a prefix */ + ret = count; } kfree(tmp); return ret;