From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v7 02/49] audit: pass in dentry to audit_copy_inode wherever possible Date: Mon, 1 Oct 2012 20:16:11 -0400 Message-ID: <1349137018-21948-3-git-send-email-jlayton@redhat.com> References: <1349137018-21948-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-mx13.extmail.prod.ext.phx2.redhat.com [10.5.110.18]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q920H91M028602 for ; Mon, 1 Oct 2012 20:17:09 -0400 Received: from mail-yx0-f174.google.com (mail-yx0-f174.google.com [209.85.213.174]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q920H6t6018698 for ; Mon, 1 Oct 2012 20:17:08 -0400 Received: by mail-yx0-f174.google.com with SMTP id m12so1534914yen.33 for ; Mon, 01 Oct 2012 17:17:08 -0700 (PDT) In-Reply-To: <1349137018-21948-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: viro@ZenIV.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, linux-audit@redhat.com, linux-kernel@vger.kernel.org List-Id: linux-audit@redhat.com 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