From acac504df6cbb989147102c83a980f7f89394106 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Wed, 10 Oct 2012 15:25:24 -0400
Subject: [PATCH] --- yaml --- r: 333899 b: refs/heads/master c:
 29e9a3467c1367549568d7d411d5f30209ae181b h: refs/heads/master i:   333897:
 46a010acde1801461ee0efe8f056b497251638bb   333895:
 aa3ece074b73a9a09dc3fa35be72d6fb74ceaf4f v: v3

---
 [refs]                     |  2 +-
 trunk/kernel/auditfilter.c | 27 +++++++--------------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 7b732398c718..c6aef8f1ac13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 563a0d1236c2c58d584ef122a5cdc9930e5860b3
+refs/heads/master: 29e9a3467c1367549568d7d411d5f30209ae181b
diff --git a/trunk/kernel/auditfilter.c b/trunk/kernel/auditfilter.c
index ff4011c19b13..d705eb17661b 100644
--- a/trunk/kernel/auditfilter.c
+++ b/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);
 }