audit,module: restore audit logging in load failure case

[ Upstream commit ae1ae11fb277f1335d6bcd4935ba0ea985af3c32 ]

The move of the module sanity check to earlier skipped the audit logging
call in the case of failure and to a place where the previously used
context is unavailable.

Add an audit logging call for the module loading failure case and get
the module name when possible.

Link: https://issues.redhat.com/browse/RHEL-52839
Fixes: 02da2cbab452 ("module: move check_modinfo() early to early_mod_check()")
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Reviewed-by: Petr Pavlu <petr.pavlu@suse.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/linux/audit.h b/include/linux/audit.h
index 51b1b7054a233a167fa29a6461cce4bc5202a75e..335e1ba5a2327166074157c03d5e48e03c8eff55 100644 (file)
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -416,7 +416,7 @@ extern int __audit_log_bprm_fcaps(struct linux_binprm *bprm,
 extern void __audit_log_capset(const struct cred *new, const struct cred *old);
 extern void __audit_mmap_fd(int fd, int flags);
 extern void __audit_openat2_how(struct open_how *how);
-extern void __audit_log_kern_module(char *name);
+extern void __audit_log_kern_module(const char *name);
 extern void __audit_fanotify(u32 response, struct fanotify_response_info_audit_rule *friar);
 extern void __audit_tk_injoffset(struct timespec64 offset);
 extern void __audit_ntp_log(const struct audit_ntp_data *ad);
@@ -518,7 +518,7 @@ static inline void audit_openat2_how(struct open_how *how)
                __audit_openat2_how(how);
 }
 
-static inline void audit_log_kern_module(char *name)
+static inline void audit_log_kern_module(const char *name)
 {
        if (!audit_dummy_context())
                __audit_log_kern_module(name);
@@ -676,9 +676,8 @@ static inline void audit_mmap_fd(int fd, int flags)
 static inline void audit_openat2_how(struct open_how *how)
 { }
 
-static inline void audit_log_kern_module(char *name)
-{
-}
+static inline void audit_log_kern_module(const char *name)
+{ }
 
 static inline void audit_fanotify(u32 response, struct fanotify_response_info_audit_rule *friar)
 { }

diff --git a/kernel/audit.h b/kernel/audit.h
index a60d2840559e2bda51bd2db82e62474886490996..5156ecd35457339c43b01ab2a23163c1ed1063a6 100644 (file)
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -199,7 +199,7 @@ struct audit_context {
                        int                     argc;
                } execve;
                struct {
-                       char                    *name;
+                       const char              *name;
                } module;
                struct {
                        struct audit_ntp_data   ntp_data;

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 6f0d6fb6523fa76fea59ebe32dd68def39d449c0..d48830c7e4beb7de60a316bad43f4d4910cfac65 100644 (file)
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -2870,7 +2870,7 @@ void __audit_openat2_how(struct open_how *how)
        context->type = AUDIT_OPENAT2;
 }
 
-void __audit_log_kern_module(char *name)
+void __audit_log_kern_module(const char *name)
 {
        struct audit_context *context = audit_context();
 

diff --git a/kernel/module/main.c b/kernel/module/main.c
index b00e31721a73e398c9bce71164139e92766b7c1c..9711ad14825b2455918e1f98b72325c22a743445 100644 (file)
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -2876,7 +2876,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
 
        module_allocated = true;
 
-       audit_log_kern_module(mod->name);
+       audit_log_kern_module(info->name);
 
        /* Reserve our place in the list. */
        err = add_unformed_module(mod);
@@ -3034,8 +3034,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
         * failures once the proper module was allocated and
         * before that.
         */
-       if (!module_allocated)
+       if (!module_allocated) {
+               audit_log_kern_module(info->name ? info->name : "?");
                mod_stat_bump_becoming(info, flags);
+       }
        free_copy(info, flags);
        return err;
 }