summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo Abeni <pabeni@redhat.com>2020-04-30 15:01:54 +0200
committerDavid S. Miller <davem@davemloft.net>2020-04-30 21:23:22 +0200
commit5a91e32b40af86c790c4348aa3a5926a5c5fbc6d (patch)
treeb37d96ed1fc96dcb3fa7fb5b86ee8fe962b89097
parentmptcp: avoid a WARN on bad input. (diff)
downloadlinux-5a91e32b40af86c790c4348aa3a5926a5c5fbc6d.tar.xz
linux-5a91e32b40af86c790c4348aa3a5926a5c5fbc6d.zip
mptcp: fix 'use_ack' option access.
The mentioned RX option field is initialized only for DSS packet, we must access it only if 'dss' is set too, or the subflow will end-up in a bad status, leading to RFC violations. Fixes: d22f4988ffec ("mptcp: process MP_CAPABLE data option") Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/mptcp/options.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index ecf41d52d2fc..9486720c3256 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -695,7 +695,7 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *sk,
if (TCP_SKB_CB(skb)->seq != subflow->ssn_offset + 1)
return subflow->mp_capable;
- if (mp_opt->use_ack) {
+ if (mp_opt->dss && mp_opt->use_ack) {
/* subflows are fully established as soon as we get any
* additional ack.
*/