Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

switch copy_module_from_fd() to fdget

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2013-08-30 12:41:41 -04:00
parent e95c311e17
commit a2e0578be3
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kernel/module.c
View file

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