--- ./drivers/char/mem.c.fix 2004-02-22 18:35:31.000000000 +0100 +++ ./drivers/char/mem.c 2004-03-23 16:02:54.000000000 +0100 @@ -43,10 +43,11 @@ extern void tapechar_init(void); #endif -static ssize_t do_write_mem(struct file * file, void *p, unsigned long realp, +static ssize_t do_write_mem(void *p, unsigned long realp, const char * buf, size_t count, loff_t *ppos) { ssize_t written; + unsigned long uncopied; written = 0; #if defined(__sparc__) || defined(__mc68000__) @@ -61,8 +62,14 @@ written+=sz; } #endif - if (copy_from_user(p, buf, count)) - return -EFAULT; + uncopied = copy_from_user(p, buf, count); + if (uncopied) { + ssize_t ret = written + (count - uncopied); + + if (ret) + return ret; + return -EFAULT; + } written += count; *ppos += written; return written; @@ -120,7 +127,7 @@ return 0; if (count > end_mem - p) count = end_mem - p; - return do_write_mem(file, __va(p), p, buf, count, ppos); + return do_write_mem(__va(p), p, buf, count, ppos); } #ifndef pgprot_noncached @@ -287,11 +294,16 @@ char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */ if (p < (unsigned long) high_memory) { + ssize_t written; + wrote = count; if (count > (unsigned long) high_memory - p) wrote = (unsigned long) high_memory - p; - wrote = do_write_mem(file, (void*)p, p, buf, wrote, ppos); + written = do_write_mem((void*)p, p, buf, wrote, ppos); + if (written != wrote) + return written; + wrote = written; p += wrote; buf += wrote; @@ -301,15 +313,22 @@ if (count > 0) { kbuf = (char *)__get_free_page(GFP_KERNEL); if (!kbuf) - return -ENOMEM; + return wrote ? wrote : -ENOMEM; while (count > 0) { int len = count; if (len > PAGE_SIZE) len = PAGE_SIZE; - if (len && copy_from_user(kbuf, buf, len)) { - free_page((unsigned long)kbuf); - return -EFAULT; + if (len) { + ssize_t unwritten; + unwritten = copy_from_user(kbuf, buf, len); + if (unwritten != len) { + ssize_t ret; + + free_page((unsigned long)kbuf); + ret = wrote + virtr + (len - unwritten); + return ret ? ret : -EFAULT; + } } len = vwrite(kbuf, (char *)p, len); count -= len;