Browse Source

audit: make audit_compare_dname_path use parent_len helper

Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Eric Paris 12 years ago
parent
commit
29e9a3467c
1 changed files with 7 additions and 20 deletions
  1. 7 20
      kernel/auditfilter.c

+ 7 - 20
kernel/auditfilter.c

@@ -1332,32 +1332,19 @@ int parent_len(const char *path)
  * return of 0 indicates a match. */
  * return of 0 indicates a match. */
 int audit_compare_dname_path(const char *dname, const char *path)
 int audit_compare_dname_path(const char *dname, const char *path)
 {
 {
-	int dlen, plen;
+	int dlen, pathlen, parentlen;
 	const char *p;
 	const char *p;
 
 
-	if (!dname || !path)
-		return 1;
-
 	dlen = strlen(dname);
 	dlen = strlen(dname);
-	plen = strlen(path);
-	if (plen < dlen)
+	pathlen = strlen(path);
+	if (pathlen < dlen)
 		return 1;
 		return 1;
 
 
-	/* disregard trailing slashes */
-	p = path + plen - 1;
-	while ((*p == '/') && (p > path))
-		p--;
-
-	/* find last path component */
-	p = p - dlen + 1;
-	if (p < path)
+	parentlen = parent_len(path);
+	if (pathlen - parentlen != dlen)
 		return 1;
 		return 1;
-	else if (p > path) {
-		if (*--p != '/')
-			return 1;
-		else
-			p++;
-	}
+
+	p = path + parentlen;
 
 
 	return strncmp(p, dname, dlen);
 	return strncmp(p, dname, dlen);
 }
 }