mptcp: fix a DSS option writing error
authorGeliang Tang <geliang.tang@suse.com>
Thu, 6 Jan 2022 22:06:37 +0000 (14:06 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Jan 2022 11:29:45 +0000 (11:29 +0000)
'ptr += 1;' was omitted in the original code.

If the DSS is the last option -- which is what we have most of the
time -- that's not an issue. But it is if we need to send something else
after like a RM_ADDR or an MP_PRIO.

Fixes: 1bff1e43a30e ("mptcp: optimize out option generation")
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/mptcp/options.c

index 96c6efdd48bccd01cabe95678f7b0d9deaa62ec4..6661b1d6520f17302b9e21cbc79aeefdfa7c82d2 100644 (file)
@@ -1319,6 +1319,7 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp,
                                put_unaligned_be32(mpext->data_len << 16 |
                                                   TCPOPT_NOP << 8 | TCPOPT_NOP, ptr);
                        }
+                       ptr += 1;
                }
        } else if (OPTIONS_MPTCP_MPC & opts->suboptions) {
                u8 len, flag = MPTCP_CAP_HMAC_SHA256;