Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b844f0ec authored by Mimi Zohar's avatar Mimi Zohar
Browse files

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: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarLuis R. Rodriguez <mcgrof@kernel.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>

Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
parent 39eeb4fb

fs/exec.c

+16 −0
Original line number Diff line number Diff line
@@ -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);

include/linux/fs.h

+2 −0
Original line number Diff line number Diff line
@@ -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 *);