diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2020-10-05 12:01:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-10-06 15:06:59 +0200 |
| commit | 017512a07e15b66472946cf5e6f4b4511e7cf898 (patch) | |
| tree | b2dce58e4aca37bec8b52681ebc7671f149fba95 /net/mptcp/subflow.c | |
| parent | Merge branch 'Fix-tail-dropping-watermarks-for-Ocelot-switches' (diff) | |
| download | linux-017512a07e15b66472946cf5e6f4b4511e7cf898.tar.xz linux-017512a07e15b66472946cf5e6f4b4511e7cf898.zip | |
mptcp: more DATA FIN fixes
Currently data fin on data packet are not handled properly:
the 'rcv_data_fin_seq' field is interpreted as the last
sequence number carrying a valid data, but for data fin
packet with valid maps we currently store map_seq + map_len,
that is, the next value.
The 'write_seq' fields carries instead the value subseguent
to the last valid byte, so in mptcp_write_data_fin() we
never detect correctly the last DSS map.
Fixes: 7279da6145bb ("mptcp: Use MPTCP-level flag for sending DATA_FIN")
Fixes: 1a49b2c2a501 ("mptcp: Handle incoming 32-bit DATA_FIN values")
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/mptcp/subflow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 5f2fa935022d..6f035af1c9d2 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -749,7 +749,7 @@ static enum mapping_status get_mapping_status(struct sock *ssk, return MAPPING_DATA_FIN; } } else { - u64 data_fin_seq = mpext->data_seq + data_len; + u64 data_fin_seq = mpext->data_seq + data_len - 1; /* If mpext->data_seq is a 32-bit value, data_fin_seq * must also be limited to 32 bits. |