From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v4 2/9] audit: pass in dentry to audit_copy_inode wherever possible Date: Tue, 26 Jun 2012 12:35:30 -0400 Message-ID: <1340728537-25599-3-git-send-email-jlayton@redhat.com> References: <1340728537-25599-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-mx16.extmail.prod.ext.phx2.redhat.com [10.5.110.21]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q5QGZliM029018 for ; Tue, 26 Jun 2012 12:35:47 -0400 Received: from mail-yw0-f48.google.com (mail-yw0-f48.google.com [209.85.213.48]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q5QGZkfv014061 for ; Tue, 26 Jun 2012 12:35:46 -0400 Received: by yhfq46 with SMTP id q46so125558yhf.35 for ; Tue, 26 Jun 2012 09:35:46 -0700 (PDT) In-Reply-To: <1340728537-25599-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, 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 files 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.7.6