From: Xin Long <lucien.xin@gmail.com>
Date: Mon, 18 Mar 2019 12:06:02 +0000 (+0800)
Subject: sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_CONTEXT sockopt
X-Git-Tag: v5.1-rc3~35^2~49^2~9
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cface2cb585e392995cc11a4a814b433e6099ec7;p=uclinux-h8%2Flinux.git

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

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

Fixes: 49b037acca8c ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_CONTEXT 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 3bac03931b67..b024a625f78a 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -3540,6 +3540,9 @@ static int sctp_setsockopt_context(struct sock *sk, char __user *optval,
 		return 0;
 	}
 
+	if (sctp_style(sk, TCP))
+		params.assoc_id = SCTP_FUTURE_ASSOC;
+
 	if (params.assoc_id == SCTP_FUTURE_ASSOC ||
 	    params.assoc_id == SCTP_ALL_ASSOC)
 		sp->default_rcv_context = params.assoc_value;