summaryrefslogtreecommitdiff
path: root/kernel/module.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-02-17 12:26:14 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2017-02-17 12:26:14 +1100
commitaddc481a295080ead4f09495a50edfedc1b7db7b (patch)
tree55093c1e3e390ccdae5ca94dbed131a6ab15ab18 /kernel/module.c
parent87b5e13aba208ff50062c8c34fb1a905efeef483 (diff)
parentfe8e52b9b9100c486051aaf5208dbf4072bb87b1 (diff)
Merge remote-tracking branch 'audit/next'
Diffstat (limited to 'kernel/module.c')
-rw-r--r--kernel/module.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/module.c b/kernel/module.c
index bf08c96ba9fb..6082706d9364 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -61,6 +61,7 @@
#include <linux/pfn.h>
#include <linux/bsearch.h>
#include <linux/dynamic_debug.h>
+#include <linux/audit.h>
#include <uapi/linux/module.h>
#include "module-internal.h"
@@ -3610,6 +3611,8 @@ static int load_module(struct load_info *info, const char __user *uargs,
goto free_copy;
}
+ audit_log_kern_module(mod->name);
+
/* Reserve our place in the list. */
err = add_unformed_module(mod);
if (err)
@@ -3698,7 +3701,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
mod->name, after_dashes);
}
- /* Link in to syfs. */
+ /* Link in to sysfs. */
err = mod_sysfs_setup(mod, info, mod->kp, mod->num_kp);
if (err < 0)
goto coming_cleanup;