mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-23 23:21:46 +00:00
Merge branch 'stable-4.11' of git://git.infradead.org/users/pcmoore/audit
Pull audit updates from Paul Moore: "The audit changes for v4.11 are relatively small compared to what we did for v4.10, both in terms of size and impact. - two patches from Steve tweak the formatting for some of the audit records to make them more consistent with other audit records. - three patches from Richard record the name of a module on module load, fix the logging of sockaddr information when using socketcall() on 32-bit systems, and add the ability to reset audit's lost record counter. - my lone patch just fixes an annoying style nit that I was reminded about by one of Richard's patches. All these patches pass our test suite" * 'stable-4.11' of git://git.infradead.org/users/pcmoore/audit: audit: remove unnecessary curly braces from switch/case statements audit: log module name on init_module audit: log 32-bit socketcalls audit: add feature audit_lost reset audit: Make AUDIT_ANOM_ABEND event normalized audit: Make AUDIT_KERNEL event conform to the specification
This commit is contained in:
commit
b8989bccd6
7 changed files with 96 additions and 20 deletions
|
@ -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"
|
||||
|
||||
|
@ -3608,6 +3609,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)
|
||||
|
@ -3696,7 +3699,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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue