---

yaml
---
r: 333899
b: refs/heads/master
c: 29e9a34
h: refs/heads/master
i:
  333897: 46a010a
  333895: aa3ece0
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 563a0d1236c2c58d584ef122a5cdc9930e5860b3
+refs/heads/master: 29e9a3467c1367549568d7d411d5f30209ae181b

trunk/kernel/auditfilter.c

@@ -1332,32 +1332,19 @@ int parent_len(const char *path)
  * return of 0 indicates a match. */
 int audit_compare_dname_path(const char *dname, const char *path)
 {
-	int dlen, plen;
+	int dlen, pathlen, parentlen;
 	const char *p;
 
-	if (!dname || !path)
-		return 1;
-
 	dlen = strlen(dname);
-	plen = strlen(path);
-	if (plen < dlen)
+	pathlen = strlen(path);
+	if (pathlen < dlen)
 		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;
-	else if (p > path) {
-		if (*--p != '/')
-			return 1;
-		else
-			p++;
-	}
+
+	p = path + parentlen;
 
 	return strncmp(p, dname, dlen);
 }