diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2016-02-01 08:36:21 -0500 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2016-02-21 09:06:10 -0500 |
| commit | b844f0ecbc5626ec26cfc70cb144a4c9b85dc3f2 (patch) | |
| tree | 79e25e330dbfadf46c106c119a7f105e3f419697 | |
| parent | 39eeb4fb97f60dbdfc823c1a673a8844b9226b60 (diff) | |
| download | linux-b844f0ecbc5626ec26cfc70cb144a4c9b85dc3f2.tar.bz2 | |
vfs: define kernel_copy_file_from_fd()
This patch defines kernel_read_file_from_fd(), a wrapper for the VFS
common kernel_read_file().
Changelog:
- Separated from the kernel modules patch
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
| -rw-r--r-- | fs/exec.c | 16 | ||||
| -rw-r--r-- | include/linux/fs.h | 2 |
2 files changed, 18 insertions, 0 deletions
diff --git a/fs/exec.c b/fs/exec.c index 8aaa38666119..9bdf0edf570d 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -907,6 +907,22 @@ int kernel_read_file_from_path(char *path, void **buf, loff_t *size, } EXPORT_SYMBOL_GPL(kernel_read_file_from_path); +int kernel_read_file_from_fd(int fd, void **buf, loff_t *size, loff_t max_size, + enum kernel_read_file_id id) +{ + struct fd f = fdget(fd); + int ret = -EBADF; + + if (!f.file) + goto out; + + ret = kernel_read_file(f.file, buf, size, max_size, id); +out: + fdput(f); + return ret; +} +EXPORT_SYMBOL_GPL(kernel_read_file_from_fd); + ssize_t read_code(struct file *file, unsigned long addr, loff_t pos, size_t len) { ssize_t res = vfs_read(file, (void __user *)addr, len, &pos); diff --git a/include/linux/fs.h b/include/linux/fs.h index c8bc4d8c843f..9c85deae1bf2 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2586,6 +2586,8 @@ extern int kernel_read_file(struct file *, void **, loff_t *, loff_t, enum kernel_read_file_id); extern int kernel_read_file_from_path(char *, void **, loff_t *, loff_t, enum kernel_read_file_id); +extern int kernel_read_file_from_fd(int, void **, loff_t *, loff_t, + enum kernel_read_file_id); extern ssize_t kernel_write(struct file *, const char *, size_t, loff_t); extern ssize_t __kernel_write(struct file *, const char *, size_t, loff_t *); extern struct file * open_exec(const char *); |