Merge tag 'for-linus-5.10b-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / kernel / module.c

diff --git a/kernel/module.c b/kernel/module.c
index c075a18..9d9f240 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -18,6 +18,7 @@
 #include <linux/fs.h>
 #include <linux/sysfs.h>
 #include <linux/kernel.h>
+#include <linux/kernel_read_file.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/elf.h>
@@ -3013,7 +3014,7 @@ static int copy_module_from_user(const void __user *umod, unsigned long len,
        if (info->len < sizeof(*(info->hdr)))
                return -ENOEXEC;
 
-       err = security_kernel_load_data(LOADING_MODULE);
+       err = security_kernel_load_data(LOADING_MODULE, true);
        if (err)
                return err;
 
@@ -3023,11 +3024,17 @@ static int copy_module_from_user(const void __user *umod, unsigned long len,
                return -ENOMEM;
 
        if (copy_chunked_from_user(info->hdr, umod, info->len) != 0) {
-               vfree(info->hdr);
-               return -EFAULT;
+               err = -EFAULT;
+               goto out;
        }
 
-       return 0;
+       err = security_kernel_post_load_data((char *)info->hdr, info->len,
+                                            LOADING_MODULE, "init_module");
+out:
+       if (err)
+               vfree(info->hdr);
+
+       return err;
 }
 
 static void free_copy(struct load_info *info)
@@ -4043,8 +4050,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
 SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags)
 {
        struct load_info info = { };
-       loff_t size;
-       void *hdr;
+       void *hdr = NULL;
        int err;
 
        err = may_init_module();
@@ -4057,12 +4063,12 @@ SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags)
                      |MODULE_INIT_IGNORE_VERMAGIC))
                return -EINVAL;
 
-       err = kernel_read_file_from_fd(fd, &hdr, &size, INT_MAX,
+       err = kernel_read_file_from_fd(fd, 0, &hdr, INT_MAX, NULL,
                                       READING_MODULE);
-       if (err)
+       if (err < 0)
                return err;
        info.hdr = hdr;
-       info.len = size;
+       info.len = err;
 
        return load_module(&info, uargs, flags);
 }