Commit 88b7d370 authored by Alexey Kodanev's avatar Alexey Kodanev Committed by Paul Moore
Browse files

selinux: fix address family in bind() and connect() to match address/port 



Since sctp_bindx() and sctp_connectx() can have multiple addresses,
sk_family can differ from sa_family. Therefore, selinux_socket_bind()
and selinux_socket_connect_helper(), which process sockaddr structure
(address and port), should use the address family from that structure
too, and not from the socket one.

The initialization of the data for the audit record is moved above,
in selinux_socket_bind(), so that there is no duplicate changes and
code.

Fixes: d452930f ("selinux: Add SCTP support")
Suggested-by: default avatarPaul Moore <paul@paul-moore.com>
Signed-off-by: default avatarAlexey Kodanev <alexey.kodanev@oracle.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 0f8db8cc

security/selinux/hooks.c

+7 −11
Original line number Diff line number Diff line
@@ -4622,6 +4622,11 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in 
			goto err_af;

		}



		ad.type = LSM_AUDIT_DATA_NET;

		ad.u.net = &net;

		ad.u.net->sport = htons(snum);

		ad.u.net->family = family_sa;



		if (snum) {

			int low, high;
@@ -4633,10 +4638,6 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in 
						      snum, &sid);

				if (err)

					goto out;

				ad.type = LSM_AUDIT_DATA_NET;

				ad.u.net = &net;

				ad.u.net->sport = htons(snum);

				ad.u.net->family = family;

				err = avc_has_perm(&selinux_state,

						   sksec->sid, sid,

						   sksec->sclass,
@@ -4668,15 +4669,10 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in 
			break;

		}



		err = sel_netnode_sid(addrp, family, &sid);

		err = sel_netnode_sid(addrp, family_sa, &sid);

		if (err)

			goto out;



		ad.type = LSM_AUDIT_DATA_NET;

		ad.u.net = &net;

		ad.u.net->sport = htons(snum);

		ad.u.net->family = family;



		if (family_sa == AF_INET)

			ad.u.net->v4info.saddr = addr4->sin_addr.s_addr;

		else
@@ -4772,7 +4768,7 @@ static int selinux_socket_connect_helper(struct socket *sock, 
		ad.type = LSM_AUDIT_DATA_NET;

		ad.u.net = &net;

		ad.u.net->dport = htons(snum);

		ad.u.net->family = sk->sk_family;

		ad.u.net->family = address->sa_family;

		err = avc_has_perm(&selinux_state,

				   sksec->sid, sid, sksec->sclass, perm, &ad);

		if (err)

CRA Git | Maintained and supported by SUSTech CRA and CCSE