diff options
author | Jeff Layton <jlayton@redhat.com> | 2012-10-10 15:25:21 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-12 00:31:59 -0400 |
commit | 9cec9d68ae53aae60b4a1fca4505c75a1d026392 (patch) | |
tree | da913dbacdb569b382182beb70c660ac93a39e5a | |
parent | 1c2e51e8c162417d2831007ec256ede06c3a0201 (diff) | |
download | linux-3.10-9cec9d68ae53aae60b4a1fca4505c75a1d026392.tar.gz linux-3.10-9cec9d68ae53aae60b4a1fca4505c75a1d026392.tar.bz2 linux-3.10-9cec9d68ae53aae60b4a1fca4505c75a1d026392.zip |
audit: no need to walk list in audit_inode if name is NULL
If name is NULL then the condition in the loop will never be true. Also,
with this change, we can eliminate the check for n->name == NULL since
the equivalence check will never be true if it is.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | kernel/auditsc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 4d1bd62b090..2e481141b01 100644 --- a/kernel/auditsc.c +++ b/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) |