]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_ENABLE_STREAM_RESET sockopt
authorXin Long <lucien.xin@gmail.com>
Mon, 18 Mar 2019 12:06:09 +0000 (20:06 +0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Mar 2019 01:31:09 +0000 (18:31 -0700)
A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on
SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_ENABLE_STREAM_RESET sockopt.

Fixes: 99a62135e127 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_ENABLE_STREAM_RESET sockopt")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sctp/socket.c

index 238e5c804cc94954ce905169cd3453dbd566028b..6b0ee8946bdb6ffa44831751643956c310eeaa54 100644 (file)
@@ -4281,6 +4281,9 @@ static int sctp_setsockopt_enable_strreset(struct sock *sk,
                goto out;
        }
 
+       if (sctp_style(sk, TCP))
+               params.assoc_id = SCTP_FUTURE_ASSOC;
+
        if (params.assoc_id == SCTP_FUTURE_ASSOC ||
            params.assoc_id == SCTP_ALL_ASSOC)
                ep->strreset_enable = params.assoc_value;