UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] adjust /dev/{kmem,mem,port} write handlers 

The /dev/mem and /dev/kmem write handlers weren't fully POSIX compliant in
that they wouldn't always force the file pointer to be updated when
returning success status.

The /dev/port write handler was inconsistent with the /dev/mem and
/dev/kmem handlers in that when encountering a -EFAULT condition after
already having written a number of items it would return -EFAULT rather
than the number of bytes written.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jan Beulich 2006-03-25 03:07:31 -08:00 committed by Linus Torvalds
parent 58bf6a2db2
commit c654d60e8f
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/char/mem.c
View File

@ -216,11 +216,9 @@ static ssize_t write_mem(struct file * file, const char __user * buf,
copied = copy_from_user(ptr, buf, sz); copied = copy_from_user(ptr, buf, sz);
if (copied) { if (copied) {
ssize_t ret; written += sz - copied;
if (written)
ret = written + (sz - copied); break;
if (ret)
return ret;
return -EFAULT; return -EFAULT;
} }
buf += sz; buf += sz;
@ -456,11 +454,9 @@ do_write_kmem(void *p, unsigned long realp, const char __user * buf,
copied = copy_from_user(ptr, buf, sz); copied = copy_from_user(ptr, buf, sz);
if (copied) { if (copied) {
ssize_t ret; written += sz - copied;
if (written)
ret = written + (sz - copied); break;
if (ret)
return ret;
return -EFAULT; return -EFAULT;
} }
buf += sz; buf += sz;
@ -514,11 +510,10 @@ static ssize_t write_kmem(struct file * file, const char __user * buf,
if (len) { if (len) {
written = copy_from_user(kbuf, buf, len); written = copy_from_user(kbuf, buf, len);
if (written) { if (written) {
ssize_t ret; if (wrote + virtr)
break;
free_page((unsigned long)kbuf); free_page((unsigned long)kbuf);
ret = wrote + virtr + (len - written); return -EFAULT;
return ret ? ret : -EFAULT;
} }
} }
len = vwrite(kbuf, (char *)p, len); len = vwrite(kbuf, (char *)p, len);
@ -563,8 +558,11 @@ static ssize_t write_port(struct file * file, const char __user * buf,
return -EFAULT; return -EFAULT;
while (count-- > 0 && i < 65536) { while (count-- > 0 && i < 65536) {
char c; char c;
if (__get_user(c, tmp)) if (__get_user(c, tmp)) {
if (tmp > buf)
break;
return -EFAULT; return -EFAULT;
}
outb(c,i); outb(c,i);
i++; i++;
tmp++; tmp++;