summaryrefslogtreecommitdiff
path: root/kernel/module
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2025-07-28 18:31:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2025-07-28 18:31:06 -0700
commite833f7dfe3c9a6a254c56f2b92a78bab6128622a (patch)
treeb15ea3a33198751bcd424d06f85273c20490d9b5 /kernel/module
parentdffb641bea1d0c5a4017771aafb39513701095be (diff)
parentae1ae11fb277f1335d6bcd4935ba0ea985af3c32 (diff)
Merge tag 'audit-pr-20250725' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit
Pull audit update from Paul Moore: "A single audit patch that restores logging of an audit event in the module load failure case" * tag 'audit-pr-20250725' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit: audit,module: restore audit logging in load failure case
Diffstat (limited to 'kernel/module')
-rw-r--r--kernel/module/main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/module/main.c b/kernel/module/main.c
index c2c08007029d..43df45c39f59 100644
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -3373,7 +3373,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);
@@ -3537,8 +3537,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;
}