dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

audit: make audit_compare_dname_path use parent_len helper 

Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Eric Paris 2012-10-10 15:25:24 -04:00 committed by Al Viro
parent 563a0d1236
commit 29e9a3467c
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/auditfilter.c
View File

@ -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);
}