Now that there is an API for checking loaded contents for modules
loaded without a file, call into the LSM hooks.

Signed-off-by: Kees Cook <keesc...@chromium.org>
---
 kernel/module.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/kernel/module.c b/kernel/module.c
index d56cb34d9a2f..90a4788dff9d 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2967,7 +2967,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, false);
+       err = security_kernel_load_data(LOADING_MODULE, true);
        if (err)
                return err;
 
@@ -2977,11 +2977,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);
+out:
+       if (err)
+               vfree(info->hdr);
+
+       return err;
 }
 
 static void free_copy(struct load_info *info)
-- 
2.25.1


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Reply via email to