mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
/dev/mem: cleanup unxlate_dev_mem_ptr() calls
No behaviour change. [akpm@linux-foundation.org: cleanuplets] [akpm@linux-foundation.org: remove unused `ret'] Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Acked-by: Andi Kleen <ak@linux.intel.com> Cc: Marcelo Tosatti <mtosatti@redhat.com> Cc: Greg Kroah-Hartman <gregkh@suse.de> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: Johannes Berg <johannes@sipsolutions.net> Cc: Avi Kivity <avi@qumranet.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
f222318e9c
commit
fa29e97bb8
1 changed files with 6 additions and 8 deletions
|
@ -154,6 +154,8 @@ static ssize_t read_mem(struct file * file, char __user * buf,
|
|||
#endif
|
||||
|
||||
while (count > 0) {
|
||||
unsigned long remaining;
|
||||
|
||||
sz = size_inside_page(p, count);
|
||||
|
||||
if (!range_is_allowed(p >> PAGE_SHIFT, count))
|
||||
|
@ -168,12 +170,10 @@ static ssize_t read_mem(struct file * file, char __user * buf,
|
|||
if (!ptr)
|
||||
return -EFAULT;
|
||||
|
||||
if (copy_to_user(buf, ptr, sz)) {
|
||||
unxlate_dev_mem_ptr(p, ptr);
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
remaining = copy_to_user(buf, ptr, sz);
|
||||
unxlate_dev_mem_ptr(p, ptr);
|
||||
if (remaining)
|
||||
return -EFAULT;
|
||||
|
||||
buf += sz;
|
||||
p += sz;
|
||||
|
@ -231,16 +231,14 @@ static ssize_t write_mem(struct file * file, const char __user * buf,
|
|||
}
|
||||
|
||||
copied = copy_from_user(ptr, buf, sz);
|
||||
unxlate_dev_mem_ptr(p, ptr);
|
||||
if (copied) {
|
||||
written += sz - copied;
|
||||
unxlate_dev_mem_ptr(p, ptr);
|
||||
if (written)
|
||||
break;
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
unxlate_dev_mem_ptr(p, ptr);
|
||||
|
||||
buf += sz;
|
||||
p += sz;
|
||||
count -= sz;
|
||||
|
|
Loading…
Reference in a new issue