commit a2e0578be3652406b2ffd2eeb31cdbdffa325d64
author Al Viro <viro@zeniv.linux.org.uk> Fri Aug 30 12:41:41 2013 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Tue Sep 03 23:04:44 2013 -0400
tree e2e4897fa737c6398c318c99817b44996e85f724
parent e95c311e170afc987f87423087f5c7974357f1c8

switch copy_module_from_fd() to fdget

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

kernel/module.c

diff --git a/kernel/module.c b/kernel/module.c
index 2069158..c6756d1 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2540,21 +2540,20 @@
 /* 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 @@
 
 	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 @@
 	info->len = pos;
 
 out:
-	fput(file);
+	fdput(f);
 	return err;
 }