From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v6 02/10] audit: pass in dentry to audit_copy_inode wherever possible Date: Fri, 7 Sep 2012 07:23:39 -0400 Message-ID: <1347017027-17167-3-git-send-email-jlayton@redhat.com> References: <1347017027-17167-1-git-send-email-jlayton@redhat.com> Cc: linux-audit@redhat.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, bfields@fieldses.org To: eparis@redhat.com, viro@zeniv.linux.org.uk Return-path: Received: from mail-vb0-f46.google.com ([209.85.212.46]:36911 "EHLO mail-vb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760473Ab2IGLX5 (ORCPT ); Fri, 7 Sep 2012 07:23:57 -0400 Received: by mail-vb0-f46.google.com with SMTP id ff1so3070301vbb.19 for ; Fri, 07 Sep 2012 04:23:57 -0700 (PDT) In-Reply-To: <1347017027-17167-1-git-send-email-jlayton@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: In some cases, we were passing in NULL even when we have a dentry. Reported-by: Eric Paris Signed-off-by: Jeff Layton --- kernel/auditsc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 4b96415..5c45b9b 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -2226,7 +2226,7 @@ void __audit_inode_child(const struct dentry *dentry, if (!strcmp(dname, n->name) || !audit_compare_dname_path(dname, n->name, &dirlen)) { if (inode) - audit_copy_inode(n, NULL, inode); + audit_copy_inode(n, dentry, inode); else n->ino = (unsigned long)-1; found_child = n->name; @@ -2258,7 +2258,7 @@ add_names: } if (inode) - audit_copy_inode(n, NULL, inode); + audit_copy_inode(n, dentry, inode); } } EXPORT_SYMBOL_GPL(__audit_inode_child); -- 1.7.11.4