Commit 6209dd91 authored by Christoph Hellwig's avatar Christoph Hellwig

fs: implement kernel_read using __kernel_read

Consolidate the two in-kernel read helpers to make upcoming changes
easier.  The only difference are the missing call to rw_verify_area
in kernel_read, and an access_ok check that doesn't make sense for
kernel buffers to start with.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent a1f9b1c0
...@@ -455,15 +455,12 @@ ssize_t __kernel_read(struct file *file, void *buf, size_t count, loff_t *pos) ...@@ -455,15 +455,12 @@ ssize_t __kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
ssize_t kernel_read(struct file *file, void *buf, size_t count, loff_t *pos) ssize_t kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
{ {
mm_segment_t old_fs; ssize_t ret;
ssize_t result;
old_fs = get_fs(); ret = rw_verify_area(READ, file, pos, count);
set_fs(KERNEL_DS); if (ret)
/* The cast to a user pointer is valid due to the set_fs() */ return ret;
result = vfs_read(file, (void __user *)buf, count, pos); return __kernel_read(file, buf, count, pos);
set_fs(old_fs);
return result;
} }
EXPORT_SYMBOL(kernel_read); EXPORT_SYMBOL(kernel_read);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment