From: Xin Long <lucien.xin@gmail.com>
Date: Mon, 18 Mar 2019 12:06:04 +0000 (+0800)
Subject: sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_AUTH_KEY sockopt
X-Git-Tag: v6.6-pxa1908~12076^2~49^2~7
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=0685d6b72207a6de7ea6853e48b009e71d64fe1b;p=linux.git

sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_AUTH_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_KEY sockopt.

Fixes: 7fb3be13a236 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_KEY sockopt")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index df879b163414..2ac221c795c2 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -3813,6 +3813,9 @@ static int sctp_setsockopt_auth_key(struct sock *sk,
 		goto out;
 	}
 
+	if (sctp_style(sk, TCP))
+		authkey->sca_assoc_id = SCTP_FUTURE_ASSOC;
+
 	if (authkey->sca_assoc_id == SCTP_FUTURE_ASSOC ||
 	    authkey->sca_assoc_id == SCTP_ALL_ASSOC) {
 		ret = sctp_auth_set_key(ep, asoc, authkey);