mptcp: Only send DATA_FIN with final mapping

When a DATA_FIN is sent in a MPTCP DSS option that contains a data
mapping, the DATA_FIN consumes one byte of space in the mapping. In this
case, the DATA_FIN should only be included in the DSS option if its
sequence number aligns with the end of the mapped data. Otherwise the
subflow can send an incorrect implicit sequence number for the DATA_FIN,
and the DATA_ACK for that sequence number would not close the
MPTCP-level connection correctly.

Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 90c81953ec2c565572f5f9c339d6f5cc12333329..b9a8305bd934823f5e509bbbc8fac2bce299528d 100644 (file)
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -304,21 +304,22 @@ static bool mptcp_established_options_mp(struct sock *sk, struct sk_buff *skb,
 static void mptcp_write_data_fin(struct mptcp_subflow_context *subflow,
                                 struct mptcp_ext *ext)
 {
-       ext->data_fin = 1;
-
        if (!ext->use_map) {
                /* RFC6824 requires a DSS mapping with specific values
                 * if DATA_FIN is set but no data payload is mapped
                 */
+               ext->data_fin = 1;
                ext->use_map = 1;
                ext->dsn64 = 1;
                ext->data_seq = subflow->data_fin_tx_seq;
                ext->subflow_seq = 0;
                ext->data_len = 1;
-       } else {
-               /* If there's an existing DSS mapping, DATA_FIN consumes
-                * 1 additional byte of mapping space.
+       } else if (ext->data_seq + ext->data_len == subflow->data_fin_tx_seq) {
+               /* If there's an existing DSS mapping and it is the
+                * final mapping, DATA_FIN consumes 1 additional byte of
+                * mapping space.
                 */
+               ext->data_fin = 1;
                ext->data_len++;
        }
 }