audit: make audit_compare_dname_path use parent_len helper

[~andy/linux] / kernel / auditfilter.c

diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 71bb13598df392ceac7bae731e211c6039ee87d2..d705eb17661b41bf57de82976d9db06f488c1cf4 100644 (file)
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -1330,39 +1330,22 @@ 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;
+       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++;
-       }
 
-       /* return length of path's directory component */
-       if (dirlen)
-               *dirlen = p - path;
+       p = path + parentlen;
+
        return strncmp(p, dname, dlen);
 }