From a5b13bc3ff7912531ecd64e4fd8a863448e991b0 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Wed, 10 Oct 2012 15:25:24 -0400 Subject: [PATCH] audit: make audit_compare_dname_path use parent_len helper Signed-off-by: Eric Paris Signed-off-by: Al Viro --- kernel/auditfilter.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index ff4011c19b13..d705eb17661b 100644 --- a/kernel/auditfilter.c +++ b/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); } -- 2.39.5