]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
mptcp: fix NULL ptr dereference in MP_JOIN error path
authorPaolo Abeni <pabeni@redhat.com>
Fri, 29 May 2020 15:49:18 +0000 (17:49 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sun, 31 May 2020 04:54:03 +0000 (21:54 -0700)
commit39884604b11692158ce0c559fc603510b96f8c2e
treed802e6bb40168f200c990efbddaccafc538c725e
parentb0c19ed6088ab41dd2a727b60594b7297c15d6ce
mptcp: fix NULL ptr dereference in MP_JOIN error path

When token lookup on MP_JOIN 3rd ack fails, the server
socket closes with a reset the incoming child. Such socket
has the 'is_mptcp' flag set, but no msk socket associated
- due to the failed lookup.

While crafting the reset packet mptcp_established_options_mp()
will try to dereference the child's master socket, causing
a NULL ptr dereference.

This change addresses the issue with explicit fallback to
TCP in such error path.

Fixes: 729cd6436f35 ("mptcp: cope better with MP_JOIN failure")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/mptcp/subflow.c