diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-05-08 09:00:28 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-07-08 08:27:57 +0200 |
| commit | 6209dd9132e8ea5545cffc84483841e88ea8cc5b (patch) | |
| tree | 5b9b51d6d71f383638e0a3ffb25911b24367f639 /fs/read_write.c | |
| parent | integrity/ima: switch to using __kernel_read (diff) | |
| download | linux-6209dd9132e8ea5545cffc84483841e88ea8cc5b.tar.xz linux-6209dd9132e8ea5545cffc84483841e88ea8cc5b.zip | |
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: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/read_write.c')
| -rw-r--r-- | fs/read_write.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index 21c9d90a257e..42a027719324 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -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) { - mm_segment_t old_fs; - ssize_t result; + ssize_t ret; - old_fs = get_fs(); - set_fs(KERNEL_DS); - /* The cast to a user pointer is valid due to the set_fs() */ - result = vfs_read(file, (void __user *)buf, count, pos); - set_fs(old_fs); - return result; + ret = rw_verify_area(READ, file, pos, count); + if (ret) + return ret; + return __kernel_read(file, buf, count, pos); } EXPORT_SYMBOL(kernel_read); |