diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-31 13:17:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-31 13:17:46 -0700 |
| commit | 37b71411b75c6a6c918e3102097417fdfed667b8 (patch) | |
| tree | a301795036851206e48d020dcd8eb3ab92238466 /kernel | |
| parent | c1d61e7fe3760851319138550efb732273ab2e57 (diff) | |
| parent | b305f7ed0f4f494ad6f3ef5667501535d5a8fa31 (diff) | |
| download | linux-37b71411b75c6a6c918e3102097417fdfed667b8.tar.bz2 | |
Merge tag 'audit-pr-20180731' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit
Pull audit fix from Paul Moore:
"A single small audit fix to guard against memory allocation failures
when logging information about a kernel module load.
It's small, easy to understand, and self-contained; while nothing is
zero risk, this should be pretty low"
* tag 'audit-pr-20180731' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
audit: fix potential null dereference 'context->module.name'
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/auditsc.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index ceb1c4596c51..80d672a11088 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -1279,8 +1279,12 @@ static void show_special(struct audit_context *context, int *call_panic) break; case AUDIT_KERN_MODULE: audit_log_format(ab, "name="); - audit_log_untrustedstring(ab, context->module.name); - kfree(context->module.name); + if (context->module.name) { + audit_log_untrustedstring(ab, context->module.name); + kfree(context->module.name); + } else + audit_log_format(ab, "(null)"); + break; } audit_log_end(ab); @@ -2411,8 +2415,9 @@ void __audit_log_kern_module(char *name) { struct audit_context *context = audit_context(); - context->module.name = kmalloc(strlen(name) + 1, GFP_KERNEL); - strcpy(context->module.name, name); + context->module.name = kstrdup(name, GFP_KERNEL); + if (!context->module.name) + audit_log_lost("out of memory in __audit_log_kern_module"); context->type = AUDIT_KERN_MODULE; } |