Skip to content

Commit e92eebb

Browse files
rprobainapcmoore
authored andcommitted
audit: fix suffixed '/' filename matching
When the user specifies a directory to delete with the suffix '/', the audit record fails to collect the filename, resulting in the following logs: type=PATH msg=audit(10/30/2024 14:11:17.796:6304) : item=2 name=(null) type=PATH msg=audit(10/30/2024 14:11:17.796:6304) : item=1 name=(null) It happens because the value of the variables dname, and n->name->name in __audit_inode_child() differ only by the suffix '/'. This commit treats this corner case by handling pathname's trailing slashes in audit_compare_dname_path(). Steps to reproduce the issue: # auditctl -w /tmp $ mkdir /tmp/foo $ rm -r /tmp/foo/ # ausearch -i | grep PATH | tail -3 The first version of this patch was based on a GitHub patch/PR by user @hqh2010 [1]. Link: linux-audit/audit-kernel#148 [1] Suggested-by: Paul Moore <[email protected]> Signed-off-by: Ricardo Robaina <[email protected]> Reviewed-by: Richard Guy Briggs <[email protected]> [PM: subject tweak, trim old metadata] Signed-off-by: Paul Moore <[email protected]>
1 parent 40384c8 commit e92eebb

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

kernel/auditfilter.c

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,13 +1319,20 @@ int audit_compare_dname_path(const struct qstr *dname, const char *path, int par
13191319
if (pathlen < dlen)
13201320
return 1;
13211321

1322-
parentlen = parentlen == AUDIT_NAME_FULL ? parent_len(path) : parentlen;
1323-
if (pathlen - parentlen != dlen)
1324-
return 1;
1322+
if (parentlen == AUDIT_NAME_FULL)
1323+
parentlen = parent_len(path);
13251324

13261325
p = path + parentlen;
13271326

1328-
return strncmp(p, dname->name, dlen);
1327+
/* handle trailing slashes */
1328+
pathlen -= parentlen;
1329+
while (p[pathlen - 1] == '/')
1330+
pathlen--;
1331+
1332+
if (pathlen != dlen)
1333+
return 1;
1334+
1335+
return memcmp(p, dname->name, dlen);
13291336
}
13301337

13311338
int audit_filter(int msgtype, unsigned int listtype)

0 commit comments

Comments
 (0)