diff options
| author | David S. Miller <davem@davemloft.net> | 2020-01-29 17:45:20 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-29 17:46:46 +0100 |
| commit | d55c6ab4b368633f39f8fe059f3b877f978cfb4c (patch) | |
| tree | 50fc4f81068aa6bb1298d0db0d974571b85a9295 /include/linux/tcp.h | |
| parent | 44efc78d0e464ce70b45b165c005f8bedc17952e (diff) | |
| parent | ae2dd7164943e03644293af92802550d052632e6 (diff) | |
Merge branch 'mptcp-fix-sockopt-crash-and-lockdep-splats'
Florian Westphal says:
====================
mptcp: fix sockopt crash and lockdep splats
Christoph Paasch reported a few bugs and lockdep splats triggered by
syzkaller.
One patch fixes a crash in set/getsockopt.
Two patches fix lockdep splats related to the order in which RTNL
and socket lock are taken.
Last patch fixes out-of-bounds access when TCP syncookies are used.
Change since last iteration on mptcp-list:
- add needed refcount in patch 2
- call tcp_get/setsockopt directly in patch 2
Other patches unchanged except minor amends to commit messages.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/tcp.h')
| -rw-r--r-- | include/linux/tcp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 1cf73e6f85ca..3dc964010fef 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -148,9 +148,7 @@ struct tcp_request_sock { const struct tcp_request_sock_ops *af_specific; u64 snt_synack; /* first SYNACK sent time */ bool tfo_listener; -#if IS_ENABLED(CONFIG_MPTCP) bool is_mptcp; -#endif u32 txhash; u32 rcv_isn; u32 snt_isn; |