]> git.baikalelectronics.ru Git - kernel.git/commit
mptcp: silence warning in subflow_data_ready()
authorDavide Caratti <dcaratti@redhat.com>
Wed, 15 Jul 2020 20:27:05 +0000 (22:27 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 17 Jul 2020 19:47:00 +0000 (12:47 -0700)
commitf57668b9931a9af7b9bbaa7f9313ef5acd3ad5a2
treea91470aed5e01dc3e32be9c994a0df56056dffd0
parent106ae943a1848837d9d5f14428277c331ffa8199
mptcp: silence warning in subflow_data_ready()

since commit e779daaaae3c ("mptcp: fix race in subflow_data_ready()"), it
is possible to observe a regression in MP_JOIN kselftests. For sockets in
TCP_CLOSE state, it's not sufficient to just wake up the main socket: we
also need to ensure that received data are made available to the reader.
Silence the WARN_ON_ONCE() in these cases: it preserves the syzkaller fix
and restores kselftests when they are ran as follows:

  # while true; do
  > make KBUILD_OUTPUT=/tmp/kselftest TARGETS=net/mptcp kselftest
  > done

Reported-by: Florian Westphal <fw@strlen.de>
Fixes: e779daaaae3c ("mptcp: fix race in subflow_data_ready()")
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/47
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/mptcp/subflow.c