From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v6 03/10] audit: no need to walk list in audit_inode if name is NULL Date: Fri, 7 Sep 2012 07:23:40 -0400 Message-ID: <1347017027-17167-4-git-send-email-jlayton@redhat.com> References: <1347017027-17167-1-git-send-email-jlayton@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.redhat.com (ext-mx12.extmail.prod.ext.phx2.redhat.com [10.5.110.17]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q87BNxGc013640 for ; Fri, 7 Sep 2012 07:23:59 -0400 Received: from mail-vb0-f46.google.com (mail-vb0-f46.google.com [209.85.212.46]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q87BNuNB009360 for ; Fri, 7 Sep 2012 07:23:58 -0400 Received: by mail-vb0-f46.google.com with SMTP id ff1so3620495vbb.33 for ; Fri, 07 Sep 2012 04:23:58 -0700 (PDT) In-Reply-To: <1347017027-17167-1-git-send-email-jlayton@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com To: eparis@redhat.com, viro@zeniv.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, bfields@fieldses.org, linux-audit@redhat.com, linux-kernel@vger.kernel.org List-Id: linux-audit@redhat.com 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 --- kernel/auditsc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 5c45b9b..4099440 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -2161,11 +2161,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) -- 1.7.11.4