mptcp: fix opt size when sending DSS + MP_FAIL
authorMatthieu Baerts <matthieu.baerts@tessares.net>
Thu, 6 Jan 2022 22:06:36 +0000 (14:06 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Jan 2022 11:29:45 +0000 (11:29 +0000)
commit04fac2cae9422a3401c172571afbcfdd58fa5c7e
treee03c83d6246873450f13120417157fa1e032978f
parent14676c04783c6363b71072c01b42bb7838eb56eb
mptcp: fix opt size when sending DSS + MP_FAIL

When these two options had to be sent -- which is not common -- the DSS
size was not being taken into account in the remaining size.

Additionally in this situation, the reported size was only the one of
the MP_FAIL which can cause issue if at the end, we need to write more
in the TCP options than previously said.

Here we use a dedicated variable for MP_FAIL size to keep the
WARN_ON_ONCE() just after.

Fixes: c25aeb4e0953 ("mptcp: MP_FAIL suboption sending")
Acked-and-tested-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/mptcp/options.c