Commit f3c0675b authored by John Johansen's avatar John Johansen
Browse files

apparmor: fix test error: WARNING in apparmor_unix_stream_connect 



commit 88fec352 ("apparmor: make sure unix socket labeling is correctly updated.")
added the use of security_sk_alloc() which ensures the sk label is
initialized.

This means that the AA_BUG in apparmor_unix_stream_connect() is no
longer correct, because while the sk is still not being initialized
by going through post_create, it is now initialize in sk_alloc().
Remove the now invalid check.

Reported-by: default avatar <syzbot+cd38ee04bcb3866b0c6d@syzkaller.appspotmail.com>
Fixes: 88fec352 ("apparmor: make sure unix socket labeling is correctly updated.")
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent 8936125e

security/apparmor/lsm.c

+3 −2
Original line number Diff line number Diff line
@@ -1205,8 +1205,9 @@ static int apparmor_unix_stream_connect(struct sock *sk, struct sock *peer_sk, 
	if (error)

		return error;



	/* newsk doesn't go through post_create */

	AA_BUG(rcu_access_pointer(new_ctx->label));

	/* newsk doesn't go through post_create, but does go through

	 * security_sk_alloc()

	 */

	rcu_assign_pointer(new_ctx->label,

			   aa_get_label(rcu_dereference_protected(peer_ctx->label,

								  true)));