[PATCH v6 08/10] audit: make audit_compare_dname_path use parent_len helper

From: Eric Paris <eparis(a)redhat.com&gt; Signed-off-by: Eric Paris <eparis(a)redhat.com&gt; --- kernel/auditfilter.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index f9c48d0..f47ba18 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -1232,32 +1232,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); } -- 1.7.11.4