Commit a2e0578b authored by Al Viro's avatar Al Viro

switch copy_module_from_fd() to fdget

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent e95c311e
...@@ -2540,21 +2540,20 @@ static int copy_module_from_user(const void __user *umod, unsigned long len, ...@@ -2540,21 +2540,20 @@ static int copy_module_from_user(const void __user *umod, unsigned long len,
/* Sets info->hdr and info->len. */ /* Sets info->hdr and info->len. */
static int copy_module_from_fd(int fd, struct load_info *info) static int copy_module_from_fd(int fd, struct load_info *info)
{ {
struct file *file; struct fd f = fdget(fd);
int err; int err;
struct kstat stat; struct kstat stat;
loff_t pos; loff_t pos;
ssize_t bytes = 0; ssize_t bytes = 0;
file = fget(fd); if (!f.file)
if (!file)
return -ENOEXEC; return -ENOEXEC;
err = security_kernel_module_from_file(file); err = security_kernel_module_from_file(f.file);
if (err) if (err)
goto out; goto out;
err = vfs_getattr(&file->f_path, &stat); err = vfs_getattr(&f.file->f_path, &stat);
if (err) if (err)
goto out; goto out;
...@@ -2577,7 +2576,7 @@ static int copy_module_from_fd(int fd, struct load_info *info) ...@@ -2577,7 +2576,7 @@ static int copy_module_from_fd(int fd, struct load_info *info)
pos = 0; pos = 0;
while (pos < stat.size) { while (pos < stat.size) {
bytes = kernel_read(file, pos, (char *)(info->hdr) + pos, bytes = kernel_read(f.file, pos, (char *)(info->hdr) + pos,
stat.size - pos); stat.size - pos);
if (bytes < 0) { if (bytes < 0) {
vfree(info->hdr); vfree(info->hdr);
...@@ -2591,7 +2590,7 @@ static int copy_module_from_fd(int fd, struct load_info *info) ...@@ -2591,7 +2590,7 @@ static int copy_module_from_fd(int fd, struct load_info *info)
info->len = pos; info->len = pos;
out: out:
fput(file); fdput(f);
return err; return err;
} }
......
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