Skip to contentSkip to conversation

audit: fix suffixed '/' filename matching in __audit_inode_child()

PATCH In review Ricardo Robaina 3 participants 5 messages Nov 22, 2024 – Dec 6, 2024 Audit

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 audit: fix suffixed '/' filename matching in __audit_inode_child()

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].

---
v2: handling pathname's trailing slashes in audit_compare_dname_path()
v1: https://lore.kernel.org/audit/20241114040948.GK3387508@ZenIV/T/#t

---
 kernel/auditfilter.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
kernel/auditfilter.c +11 -4
index 470041c49a44..8ddccdb4a2a7 100644
@@ -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)
Signature · 1 line
2.47.0
maintainer
#1 lore raw
Quoted 29 lines · On Nov 22, 2024 Ricardo Robaina <[email protected]> wrote:

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].

Quoted 6 lines

---
v2: handling pathname's trailing slashes in audit_compare_dname_path()
v1: https://lore.kernel.org/audit/20241114040948.GK3387508@ZenIV/T/#t

---
 kernel/auditfilter.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

Yes, Richard did provide a reviewed-by tag on the v1 patch, but v2 has enough changes that I don't think we can reasonably carry that forward; of course Richard re-review this iteration and provide a new tag. I'm going to remove it for now.

Al never provided an explicit reviewed-by tag; simply commenting on a patch is not the same as providing a 'Reviewed-by', the reviewer will provide an explicit 'Reviewed-by' tag in their email. I'm going to remove Al's tag too.

Other than those issues, I think this looks much better than v1, I'm going to merge this into audit/dev now, thanks!

Quoted 31 lines
kernel/auditfilter.c +11 -4
index 470041c49a44..8ddccdb4a2a7 100644
@@ -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)
Signature · 1 line
2.47.0

--
paul-moore.com

#2 lore raw
Quoted 10 lines · Paul Moore

Yes, Richard did provide a reviewed-by tag on the v1 patch, but v2 has enough changes that I don't think we can reasonably carry that forward; of course Richard re-review this iteration and provide a new tag. I'm going to remove it for now.

Al never provided an explicit reviewed-by tag; simply commenting on a patch is not the same as providing a 'Reviewed-by', the reviewer will provide an explicit 'Reviewed-by' tag in their email. I'm going to remove Al's tag too.

I'm sorry about that, I was just trying to give credit to the ones who helped. Thanks for clarifying the expected review process, I appreciate it!

Quoted 2 lines

Other than those issues, I think this looks much better than v1, I'm going to merge this into audit/dev now, thanks!

Thanks, Paul!

- Ricardo

#3 lore raw
Quoted 7 lines · Ricardo Robaina
Quoted 6 lines · Paul Moore

Yes, Richard did provide a reviewed-by tag on the v1 patch, but v2 has enough changes that I don't think we can reasonably carry that forward; of course Richard re-review this iteration and provide a new tag. I'm going to remove it for now.

Quoted 8 lines
Quoted 4 lines

Al never provided an explicit reviewed-by tag; simply commenting on a patch is not the same as providing a 'Reviewed-by', the reviewer will provide an explicit 'Reviewed-by' tag in their email. I'm going to remove Al's tag too.

I'm sorry about that, I was just trying to give credit to the ones who helped. Thanks for clarifying the expected review process, I appreciate it!

Please re-add my reviewed-by tag.

Quoted 6 lines
Quoted 2 lines

Other than those issues, I think this looks much better than v1, I'm going to merge this into audit/dev now, thanks!

Thanks, Paul!

- Ricardo

- RGB

--
Richard Guy Briggs <[email protected]>
Sr. S/W Engineer, Kernel Security, Base Operating Systems Remote, Ottawa, Red Hat Canada
Upstream IRC: SunRaycer
Voice: +1.613.860 2354 SMS: +1.613.518.6570

maintainer
#4 lore raw
Quoted 7 lines · Richard Guy Briggs
Quoted 6 lines · Ricardo Robaina
Quoted 5 lines · Paul Moore

Yes, Richard did provide a reviewed-by tag on the v1 patch, but v2 has enough changes that I don't think we can reasonably carry that forward; of course Richard re-review this iteration and provide a new tag. I'm going to remove it for now.

...

Quoted 1 line

Please re-add my reviewed-by tag.

Done, it will be pushed back up shortly.

Signature · 1 line
paul-moore.com