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

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

sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_AUTH_ACTIVE_KEY sockopt



A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on
SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_AUTH_ACTIVE_KEY sockopt.

Fixes: bf9fb6ad ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_ACTIVE_KEY sockopt")
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0685d6b7
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -3871,6 +3871,9 @@ static int sctp_setsockopt_active_key(struct sock *sk,
	if (asoc)
		return sctp_auth_set_active_key(ep, asoc, val.scact_keynumber);

	if (sctp_style(sk, TCP))
		val.scact_assoc_id = SCTP_FUTURE_ASSOC;

	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);