Commit 563a0d12 authored by Jeff Layton's avatar Jeff Layton Committed by Al Viro
Browse files

audit: remove dirlen argument to audit_compare_dname_path 



All the callers set this to NULL now.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent bfcec708

kernel/audit.h

+1 −2
Original line number Diff line number Diff line
@@ -79,8 +79,7 @@ extern int audit_comparator(const u32 left, const u32 op, const u32 right); 
extern int audit_uid_comparator(kuid_t left, u32 op, kuid_t right);

extern int audit_gid_comparator(kgid_t left, u32 op, kgid_t 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);

kernel/audit_watch.c

+1 −1
Original line number Diff line number Diff line
@@ -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

kernel/auditfilter.c

+1 −5
Original line number Diff line number Diff line
@@ -1330,8 +1330,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;
@@ -1360,9 +1359,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);

}

kernel/auditsc.c

+2 −2
Original line number Diff line number Diff line
@@ -2222,7 +2222,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;

		}
@@ -2235,7 +2235,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