Skip to content

Commit

Permalink
audit: make audit_compare_dname_path use parent_len helper
Browse files Browse the repository at this point in the history
Signed-off-by: Eric Paris <[email protected]>
Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
eparis authored and Al Viro committed Oct 12, 2012
1 parent 563a0d1 commit 29e9a34
Showing 1 changed file with 7 additions and 20 deletions.
27 changes: 7 additions & 20 deletions kernel/auditfilter.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 29e9a34

Please sign in to comment.