Skip to contentSkip to conversation

ima: Check for ERR_PTR from dentry_path() in validate_hash_algo()

PATCH In review Bradley Morgan 2 participants 3 messages Aug 27 – Sep 2

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ima: Check for ERR_PTR from dentry_path() in validate_hash_algo()

dentry_path() returns ERR_PTR(-ENAMETOOLONG) when the path exceeds the buffer. validate_hash_algo() passes the result straight to integrity_audit_msg() without checking. ERR_PTR is not NULL, so integrity_audit_message() sees a valid pointer and calls strlen() on it, which faults:

    BUG: unable to handle page fault for address: ffffffffffffffdc
    RIP: 0010:strlen+0x30/0xa0
    Call Trace:
     audit_log_untrustedstring+0x19/0x30
     integrity_audit_message+0x366/0x4f0
     ima_inode_setxattr+0x512/0x5f0

Check for IS_ERR() and use NULL instead, which makes the audit message skip the name= field instead of crashing.

Fixes 4f2946aa0c45 ("IMA: introduce a new policy option func=SETXATTR_CHECK")
Reported-by [email protected]
---
 security/integrity/ima/ima_appraise.c | 2 ++
 1 file changed, 2 insertions(+)
security/integrity/ima/ima_appraise.c +2 -0
index ced2e131b061..b280488e15fc 100644
@@ -748,6 +748,8 @@ static int validate_hash_algo(struct dentry *dentry,
 		return -EACCES;
 
 	path = dentry_path(dentry, pathbuf, PATH_MAX);
+	if (IS_ERR(path))
+		path = NULL;
 
 	integrity_audit_msg(AUDIT_INTEGRITY_DATA, d_inode(dentry), path,
 			    "set_data", errmsg, -EACCES, 0);
Signature · 1 line
2.47.3
maintainer
#1 lore raw
Quoted 13 lines · Bradley Morgan

dentry_path() returns ERR_PTR(-ENAMETOOLONG) when the path exceeds the buffer. validate_hash_algo() passes the result straight to integrity_audit_msg() without checking. ERR_PTR is not NULL, so integrity_audit_message() sees a valid pointer and calls strlen() on it, which faults:

    BUG: unable to handle page fault for address: ffffffffffffffdc
    RIP: 0010:strlen+0x30/0xa0
    Call Trace:
     audit_log_untrustedstring+0x19/0x30
     integrity_audit_message+0x366/0x4f0
     ima_inode_setxattr+0x512/0x5f0
Quoted 8 lines

Check for IS_ERR() and use NULL instead, which makes the audit message skip the name= field instead of crashing.

Fixes 4f2946aa0c45 ("IMA: introduce a new policy option func=SETXATTR_CHECK")
Reported-by [email protected]

Thanks, Bradley. The patch is now queued in next-integrity.

Mimi

#2 lore raw
Quoted 18 lines · Mimi Zohar
Quoted 13 lines · Bradley Morgan

dentry_path() returns ERR_PTR(-ENAMETOOLONG) when the path exceeds the buffer. validate_hash_algo() passes the result straight to integrity_audit_msg() without checking. ERR_PTR is not NULL, so integrity_audit_message() sees a valid pointer and calls strlen() on it, which faults:

    BUG: unable to handle page fault for address: ffffffffffffffdc
    RIP: 0010:strlen+0x30/0xa0
    Call Trace:
     audit_log_untrustedstring+0x19/0x30
     integrity_audit_message+0x366/0x4f0
     ima_inode_setxattr+0x512/0x5f0
Quoted 4 lines

Check for IS_ERR() and use NULL instead, which makes the audit message skip the name= field instead of crashing.

Fixes 4f2946aa0c45 ("IMA: introduce a new policy option
Quoted 8 lines

func=SETXATTR_CHECK")

Quoted 3 lines

Link:

https://lore.kernel.org/all/[email protected]/

Quoted 1 line

Thanks, Bradley. The patch is now queued in next-integrity.

Cheers, +CC Paul, the syzbot issue should now be fixed

Quoted 2 lines

Mimi

--- Thanks!
https://lore.kernel.org/all/[email protected]/