Skip to content

Commit

Permalink
Merge tag 'audit-pr-20250121' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history
…ernel/git/pcmoore/audit

Pull audit update from Paul Moore:
 "A single audit patch that fixes a problem when collecting pathnames
  for audit PATH records that was caused by some faulty pathname
  matching logic"

* tag 'audit-pr-20250121' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
  audit: fix suffixed '/' filename matching
  • Loading branch information
Linus Torvalds committed Jan 22, 2025
2 parents 690ffcd + e92eebb commit c4b9570
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions kernel/auditfilter.c
Original file line number Diff line number Diff line change
Expand Up @@ -1319,13 +1319,20 @@ int audit_compare_dname_path(const struct qstr *dname, const char *path, int par
if (pathlen < dlen)
return 1;

parentlen = parentlen == AUDIT_NAME_FULL ? parent_len(path) : parentlen;
if (pathlen - parentlen != dlen)
return 1;
if (parentlen == AUDIT_NAME_FULL)
parentlen = parent_len(path);

p = path + parentlen;

return strncmp(p, dname->name, dlen);
/* handle trailing slashes */
pathlen -= parentlen;
while (p[pathlen - 1] == '/')
pathlen--;

if (pathlen != dlen)
return 1;

return memcmp(p, dname->name, dlen);
}

int audit_filter(int msgtype, unsigned int listtype)
Expand Down

0 comments on commit c4b9570

Please sign in to comment.