iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98d13639e6
linux/net
History
Davide Caratti 767d3ded5f net: mptcp: don't hang before sending 'MP capable with data' 
the following packetdrill script

  socket(..., SOCK_STREAM, IPPROTO_MPTCP) = 3
  fcntl(3, F_GETFL) = 0x2 (flags O_RDWR)
  fcntl(3, F_SETFL, O_RDWR|O_NONBLOCK) = 0
  connect(3, ..., ...) = -1 EINPROGRESS (Operation now in progress)
  > S 0:0(0) <mss 1460,sackOK,TS val 100 ecr 0,nop,wscale 8,mpcapable v1 flags[flag_h] nokey>
  < S. 0:0(0) ack 1 win 65535 <mss 1460,sackOK,TS val 700 ecr 100,nop,wscale 8,mpcapable v1 flags[flag_h] key[skey=2]>
  > . 1:1(0) ack 1 win 256 <nop, nop, TS val 100 ecr 700,mpcapable v1 flags[flag_h] key[ckey,skey]>
  getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
  fcntl(3, F_SETFL, O_RDWR) = 0
  write(3, ..., 1000) = 1000

doesn't transmit 1KB data packet after a successful three-way-handshake,
using mp_capable with data as required by protocol v1, and write() hangs
forever:

 PID: 973    TASK: ffff97dd399cae80  CPU: 1   COMMAND: "packetdrill"
   [ffffa9b94062fb78] __schedule at ffffffff9c90a000
   [ffffa9b94062fc08] schedule at ffffffff9c90a4a0
   [ffffa9b94062fc18] schedule_timeout at ffffffff9c90e00d
   [ffffa9b94062fc90] wait_woken at ffffffff9c120184
   [ffffa9b94062fcb0] sk_stream_wait_connect at ffffffff9c75b064
   [ffffa9b94062fd20] mptcp_sendmsg at ffffffff9c8e801c
   [ffffa9b94062fdc0] sock_sendmsg at ffffffff9c747324
   [ffffa9b94062fdd8] sock_write_iter at ffffffff9c7473c7
   [ffffa9b94062fe48] new_sync_write at ffffffff9c302976
   [ffffa9b94062fed0] vfs_write at ffffffff9c305685
  [ffffa9b94062ff00] ksys_write at ffffffff9c305985
  [ffffa9b94062ff38] do_syscall_64 at ffffffff9c004475
  [ffffa9b94062ff50] entry_SYSCALL_64_after_hwframe at ffffffff9ca0008c
     RIP: 00007f959407eaf7  RSP: 00007ffe9e95a910  RFLAGS: 00000293
     RAX: ffffffffffffffda  RBX: 0000000000000008  RCX: 00007f959407eaf7
     RDX: 00000000000003e8  RSI: 0000000001785fe0  RDI: 0000000000000008
     RBP: 0000000001785fe0   R8: 0000000000000000   R9: 0000000000000003
     R10: 0000000000000007  R11: 0000000000000293  R12: 00000000000003e8
     R13: 00007ffe9e95ae30  R14: 0000000000000000  R15: 0000000000000000
     ORIG_RAX: 0000000000000001  CS: 0033  SS: 002b

Fix it ensuring that socket state is TCP_ESTABLISHED on reception of the
third ack.

Fixes: 1954b86016cf ("mptcp: Check connection state before attempting send")
Suggested-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-03-11 23:59:11 -07:00
..
6lowpan
…
9p
9p pull request for inclusion in 5.4
2019-09-27 15:10:34 -07:00
802
net: 802: psnap.c: Use built-in RCU list checking
2020-02-24 13:02:53 -08:00
8021q
net: vlan: suppress "failed to kill vid" warnings
2020-02-17 14:30:54 -08:00
appletalk
appletalk: enforce CAP_NET_RAW for raw sockets
2019-09-24 16:37:18 +02:00
atm
proc: convert everything to "struct proc_ops"
2020-02-04 03:05:26 +00:00
ax25
net: Make sock protocol value checks more specific
2020-01-09 18:41:40 -08:00
batman-adv
batman-adv: Replace zero-length array with flexible-array member
2020-02-17 22:43:42 +01:00
bluetooth
Bluetooth: Fix race condition in hci_release_sock()
2020-01-26 10:34:17 +02:00
bpf
bpf/tests: Use migrate disable instead of preempt disable
2020-02-24 16:20:09 -08:00
bpfilter
kbuild: rename hostprogs-y/always to hostprogs/always-y
2020-02-04 01:53:07 +09:00
bridge
net: bridge: fix stale eth hdr pointer in br_dev_xmit
2020-02-24 11:11:19 -08:00
caif
caif_usb: fix spelling mistake "to" -> "too"
2020-01-24 08:12:06 +01:00
can
can: j1939: j1939_sk_bind(): take priv after lock is held
2019-12-08 11:52:02 +01:00
ceph
Merge branch 'merge.nfs-fs_parse.1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-02-08 13:26:41 -08:00
core
net: sched: make newly activated qdiscs visible
2020-03-11 23:17:28 -07:00
dcb
…
dccp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
2020-02-29 15:53:35 -08:00
decnet
net: Make sock protocol value checks more specific
2020-01-09 18:41:40 -08:00
dns_resolver
…
dsa
flow_offload: check for basic action hw stats type
2020-03-08 21:07:48 -07:00
ethernet
net: remove eth_change_mtu
2020-01-27 11:09:31 +01:00
ethtool
ethtool: add infrastructure for centralized checking of coalescing parameters
2020-03-05 12:12:34 -08:00
hsr
hsr: fix refcnt leak of hsr slave interface
2020-03-05 11:59:47 -08:00
ieee802154
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-11-02 13:54:56 -07:00
ife
net: Fix Kconfig indentation
2019-09-26 08:56:17 +02:00
ipv4
tcp: Add missing annotation for tcp_child_process()
2020-03-11 23:19:41 -07:00
ipv6
ipv6: Use math to point per net sysctls into the appropriate struct net
2020-03-03 14:50:08 -08:00
iucv
treewide: Use sizeof_field() macro
2019-12-09 10:36:44 -08:00
kcm
bpf: Use bpf_prog_run_pin_on_cpu() at simple call sites.
2020-02-24 16:20:09 -08:00
key
…
l2tp
l2tp: Replace zero-length array with flexible-array member
2020-02-28 12:08:37 -08:00
l3mdev
…
lapb
…
llc
af_llc: fix if-statement empty body warning
2020-02-26 20:38:13 -08:00
mac80211
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2020-02-27 18:31:39 -08:00
mac802154
…
mpls
net: mpls: Replace zero-length array with flexible-array member
2020-02-28 12:08:37 -08:00
mptcp
net: mptcp: don't hang before sending 'MP capable with data'
2020-03-11 23:59:11 -07:00
ncsi
net/ncsi: Support for multi host mellanox card
2020-01-09 18:36:22 -08:00
netfilter
netfilter: xt_hashlimit: unregister proc file before releasing mutex
2020-02-26 23:25:07 +01:00
netlabel
netlabel_domainhash.c: Use built-in RCU list checking
2020-02-18 12:44:23 -08:00
netlink
net: Add missing annotation for *netlink_seq_start()
2020-03-11 23:19:41 -07:00
netrom
net: netrom: Add missing annotation for nr_neigh_stop()
2020-02-24 13:26:49 -08:00
nfc
NFC: digital: Replace zero-length array with flexible-array member
2020-02-17 19:05:05 -08:00
nsh
…
openvswitch
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2020-02-21 13:39:34 -08:00
packet
y2038: core, driver and file system changes
2020-01-29 14:55:47 -08:00
phonet
net: Remove redundant BUG_ON() check in phonet_pernet
2020-01-03 12:25:50 -08:00
psample
net: psample: fix skb_over_panic
2019-11-26 14:40:13 -08:00
qrtr
net: qrtr: Fix FIXME related to qrtr_ns_init()
2020-03-03 17:52:21 -08:00
rds
net/rds: Track user mapped pages through special API
2020-02-16 18:37:09 -08:00
rfkill
rfkill: Fix incorrect check to avoid NULL pointer dereference
2019-12-16 10:15:49 +01:00
rose
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2020-01-26 10:40:21 +01:00
rxrpc
rxrpc: Fix call RCU cleanup using non-bh-safe locks
2020-02-07 11:20:57 +01:00
sched
net: sched: make newly activated qdiscs visible
2020-03-11 23:17:28 -07:00
sctp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
2020-02-29 15:53:35 -08:00
smc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2020-02-27 18:31:39 -08:00
strparser
…
sunrpc
xprtrdma: Fix DMA scatter-gather list mapping imbalance
2020-02-13 15:35:33 -05:00
switchdev
net: switchdev: do not propagate bridge updates across bridges
2020-02-26 20:58:33 -08:00
tipc
tipc: fix successful connect() but timed out
2020-02-10 10:23:00 +01:00
tls
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
2020-02-21 15:22:45 -08:00
unix
net: datagram: drop 'destructor' argument from several helpers
2020-02-28 12:12:53 -08:00
vmw_vsock
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2020-02-27 18:31:39 -08:00
wimax
…
wireless
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2020-02-27 18:31:39 -08:00
x25
net: x25: convert to list_for_each_entry_safe()
2020-02-16 18:59:42 -08:00
xdp
xdp: Replace zero-length array with flexible-array member
2020-02-28 12:08:37 -08:00
xfrm
net: datagram: drop 'destructor' argument from several helpers
2020-02-28 12:12:53 -08:00
compat.c
y2038: socket: use __kernel_old_timespec instead of timespec
2019-11-15 14:38:29 +01:00
Kconfig
net: disable BRIDGE_NETFILTER by default
2020-02-20 15:02:02 -08:00
Makefile
mptcp: Add MPTCP socket stubs
2020-01-24 13:44:07 +01:00
socket.c
socket: fix unused-function warning
2020-01-08 15:02:21 -08:00
sysctl_net.c
…