diff --git a/[refs] b/[refs] index 16873ecac522..15f7caa99b4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c2e51e8c162417d2831007ec256ede06c3a0201 +refs/heads/master: 9cec9d68ae53aae60b4a1fca4505c75a1d026392 diff --git a/trunk/kernel/auditsc.c b/trunk/kernel/auditsc.c index 4d1bd62b090b..2e481141b014 100644 --- a/trunk/kernel/auditsc.c +++ b/trunk/kernel/auditsc.c @@ -2147,11 +2147,15 @@ void __audit_inode(const char *name, const struct dentry *dentry) if (!context->in_syscall) return; + if (!name) + goto out_alloc; + list_for_each_entry_reverse(n, &context->names_list, list) { - if (n->name && (n->name == name)) + if (n->name == name) goto out; } +out_alloc: /* unable to find the name from a previous getname() */ n = audit_alloc_name(context); if (!n)