From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v5 6/9] audit: remove dirlen argument to audit_compare_dname_path Date: Thu, 26 Jul 2012 07:21:10 -0400 Message-ID: <1343301673-10642-7-git-send-email-jlayton@redhat.com> References: <1343301673-10642-1-git-send-email-jlayton@redhat.com> Cc: linux-audit@redhat.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org To: eparis@redhat.com, viro@zeniv.linux.org.uk Return-path: Received: from mail-gh0-f174.google.com ([209.85.160.174]:39840 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752590Ab2GZLV2 (ORCPT ); Thu, 26 Jul 2012 07:21:28 -0400 Received: by ghrr11 with SMTP id r11so1816748ghr.19 for ; Thu, 26 Jul 2012 04:21:28 -0700 (PDT) In-Reply-To: <1343301673-10642-1-git-send-email-jlayton@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: All the callers set this to NULL now. Signed-off-by: Jeff Layton --- kernel/audit.h | 3 +-- kernel/audit_watch.c | 2 +- kernel/auditfilter.c | 6 +----- kernel/auditsc.c | 4 ++-- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/kernel/audit.h b/kernel/audit.h index 276ca88..ee31316 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -77,8 +77,7 @@ static inline int audit_hash_ino(u32 ino) extern int audit_match_class(int class, unsigned syscall); extern int audit_comparator(const u32 left, const u32 op, const u32 right); extern int parent_len(const char *path); -extern int audit_compare_dname_path(const char *dname, const char *path, - int *dirlen); +extern int audit_compare_dname_path(const char *dname, const char *path); extern struct sk_buff * audit_make_reply(int pid, int seq, int type, int done, int multi, const void *payload, int size); diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c index 3823281..b6a873a 100644 --- a/kernel/audit_watch.c +++ b/kernel/audit_watch.c @@ -265,7 +265,7 @@ static void audit_update_watch(struct audit_parent *parent, /* Run all of the watches on this parent looking for the one that * matches the given dname */ list_for_each_entry_safe(owatch, nextw, &parent->watches, wlist) { - if (audit_compare_dname_path(dname, owatch->path, NULL)) + if (audit_compare_dname_path(dname, owatch->path)) continue; /* If the update involves invalidating rules, do the inode-based diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index 29b167b..f9c48d0 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -1230,8 +1230,7 @@ int parent_len(const char *path) /* Compare given dentry name with last component in given path, * return of 0 indicates a match. */ -int audit_compare_dname_path(const char *dname, const char *path, - int *dirlen) +int audit_compare_dname_path(const char *dname, const char *path) { int dlen, plen; const char *p; @@ -1260,9 +1259,6 @@ int audit_compare_dname_path(const char *dname, const char *path, p++; } - /* return length of path's directory component */ - if (dirlen) - *dirlen = p - path; return strncmp(p, dname, dlen); } diff --git a/kernel/auditsc.c b/kernel/auditsc.c index e9f8b60..34d7ab2 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -2232,7 +2232,7 @@ void __audit_inode_child(const struct inode *parent, continue; if (n->ino == parent->i_ino && - !audit_compare_dname_path(dname, n->name, NULL)) { + !audit_compare_dname_path(dname, n->name)) { found_parent = n->name; goto add_names; } @@ -2245,7 +2245,7 @@ void __audit_inode_child(const struct inode *parent, /* strcmp() is the more likely scenario */ if (!strcmp(dname, n->name) || - !audit_compare_dname_path(dname, n->name, NULL)) { + !audit_compare_dname_path(dname, n->name)) { if (inode) audit_copy_inode(n, dentry, inode); else -- 1.7.11.2