Skip to content

Commit e2938ad

Browse files
System Administratorjrjohansen
authored andcommitted
apparmor: fix NULL pointer dereference in __unix_needs_revalidation
When receiving file descriptors via SCM_RIGHTS, both the socket pointer and the socket's sk pointer can be NULL during socket setup or teardown, causing NULL pointer dereferences in __unix_needs_revalidation(). This is a regression in AppArmor 5.0.0 (kernel 6.17+) where the new __unix_needs_revalidation() function was added without proper NULL checks. The crash manifests as: BUG: kernel NULL pointer dereference, address: 0x0000000000000018 RIP: aa_file_perm+0xb7/0x3b0 (or +0xbe/0x3b0, +0xc0/0x3e0) Call Trace: apparmor_file_receive+0x42/0x80 security_file_receive+0x2e/0x50 receive_fd+0x1d/0xf0 scm_detach_fds+0xad/0x1c0 The function dereferences sock->sk->sk_family without checking if either sock or sock->sk is NULL first. Add NULL checks for both sock and sock->sk before accessing sk_family. Fixes: 88fec35 ("apparmor: make sure unix socket labeling is correctly updated.") Reported-by: Jamin Mc <[email protected]> Closes: https://bugzilla.proxmox.com/show_bug.cgi?id=7083 Closes: https://gitlab.com/apparmor/apparmor/-/issues/568 Signed-off-by: Fabian Grünbichler <[email protected]> Signed-off-by: System Administrator <root@localhost> Signed-off-by: John Johansen <[email protected]>
1 parent 93d4dbd commit e2938ad

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

security/apparmor/file.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,9 @@ static bool __unix_needs_revalidation(struct file *file, struct aa_label *label,
578578
return false;
579579
if (request & NET_PEER_MASK)
580580
return false;
581+
/* sock and sock->sk can be NULL for sockets being set up or torn down */
582+
if (!sock || !sock->sk)
583+
return false;
581584
if (sock->sk->sk_family == PF_UNIX) {
582585
struct aa_sk_ctx *ctx = aa_sock(sock->sk);
583586

0 commit comments

Comments
 (0)