]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'sctp-fix-ignoring-asoc_id-for-tcp-style-sockets-on-some-setsockopts'
authorDavid S. Miller <davem@davemloft.net>
Tue, 19 Mar 2019 01:31:09 +0000 (18:31 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Mar 2019 01:31:09 +0000 (18:31 -0700)
commit2bbdf770a2e4f45327da7f846ddae9f4bf5b240e
tree6956cf767bcc0f3b4993eaae5cd9b079d9f8d85a
parentac2ba8ae98348d8cb6f8c5df9b25dad561e3a80f
parent18bdf60ea8365dc53c9c861d05e5d828d44eb771
Merge branch 'sctp-fix-ignoring-asoc_id-for-tcp-style-sockets-on-some-setsockopts'

Xin Long says:

====================
sctp: fix ignoring asoc_id for tcp-style sockets on some setsockopts

This is a patchset to fix ignoring asoc_id for tcp-style sockets on
some setsockopts, introduced by SCTP_CURRENT_ASSOC of the patchset:

  [net-next,00/24] sctp: support SCTP_FUTURE/CURRENT/ALL_ASSOC
  (https://patchwork.ozlabs.org/cover/1031706/)

As Marcelo suggested, we fix it on each setsockopt that is using
SCTP_CURRENT_ASSOC one by one by adding the check:

    if (sctp_style(sk, TCP))
         xxx.xxx_assoc_id = SCTP_FUTURE_ASSOC;

so that assoc_id will be completely ingored for tcp-style socket on
setsockopts, and works as SCTP_FUTURE_ASSOC.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>