Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf9fb6ad authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_ACTIVE_KEY sockopt 



Check with SCTP_ALL_ASSOC instead in sctp_setsockopt_auth_key.
SCTP_CURRENT_ASSOC is supported for SCTP_AUTH_ACTIVE_KEY in this patch.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7fb3be13

net/sctp/socket.c

+26 −3
Original line number Diff line number Diff line
@@ -3832,8 +3832,9 @@ static int sctp_setsockopt_active_key(struct sock *sk, 
				      unsigned int optlen)

{

	struct sctp_endpoint *ep = sctp_sk(sk)->ep;

	struct sctp_authkeyid val;

	struct sctp_association *asoc;

	struct sctp_authkeyid val;

	int ret = 0;



	if (!ep->auth_enable)

		return -EACCES;
@@ -3844,10 +3845,32 @@ static int sctp_setsockopt_active_key(struct sock *sk, 
		return -EFAULT;



	asoc = sctp_id2assoc(sk, val.scact_assoc_id);

	if (!asoc && val.scact_assoc_id && sctp_style(sk, UDP))

	if (!asoc && val.scact_assoc_id > SCTP_ALL_ASSOC &&

	    sctp_style(sk, UDP))

		return -EINVAL;



	if (asoc)

		return sctp_auth_set_active_key(ep, asoc, val.scact_keynumber);



	if (val.scact_assoc_id == SCTP_FUTURE_ASSOC ||

	    val.scact_assoc_id == SCTP_ALL_ASSOC) {

		ret = sctp_auth_set_active_key(ep, asoc, val.scact_keynumber);

		if (ret)

			return ret;

	}



	if (val.scact_assoc_id == SCTP_CURRENT_ASSOC ||

	    val.scact_assoc_id == SCTP_ALL_ASSOC) {

		list_for_each_entry(asoc, &ep->asocs, asocs) {

			int res = sctp_auth_set_active_key(ep, asoc,

							   val.scact_keynumber);



			if (res && !ret)

				ret = res;

		}

	}



	return ret;

}



/*