| Message ID | 20201001145833.4039133-1-matthieu.baerts@tessares.net |
|---|---|
| State | Superseded, archived |
| Commit | d74f20902304fa91ccdd320ed3570da4acde2d46 |
| Headers | show |
| Series | [mptcp-next] mptcp: ADD_ADDRs with echo bit are smaller | expand |
On Thu, 2020-10-01 at 16:58 +0200, Matthieu Baerts wrote: > The MPTCP ADD_ADDR suboption with echo-flag=1 has no HMAC, the size is > smaller than the one initially sent without echo-flag=1. We then need to > use the correct size not to send a packet with the wrong TCP option > lenght and containing garbage at the end. > > Fixes: 6a6c05a8b016 ("mptcp: send out ADD_ADDR with echo flag") > Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/95 > Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> Reported-and-tested-by: Davide Caratti <dcaratti@redhat.com>
Davide Caratti <dcaratti@redhat.com> 于2020年10月1日周四 下午11:29写道： > > On Thu, 2020-10-01 at 16:58 +0200, Matthieu Baerts wrote: > > The MPTCP ADD_ADDR suboption with echo-flag=1 has no HMAC, the size is > > smaller than the one initially sent without echo-flag=1. We then need to > > use the correct size not to send a packet with the wrong TCP option > > lenght and containing garbage at the end. > > > > Fixes: 6a6c05a8b016 ("mptcp: send out ADD_ADDR with echo flag") > > Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/95 > > Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> > > Reported-and-tested-by: Davide Caratti <dcaratti@redhat.com> Acked-by: Geliang Tang <geliangtang@gmail.com> > _______________________________________________ > mptcp mailing list -- mptcp@lists.01.org > To unsubscribe send an email to mptcp-leave@lists.01.org
diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 45501c5f7f93..4055769e4fde 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -587,7 +587,7 @@ static bool mptcp_established_options_add_addr(struct sock *sk, !(mptcp_pm_add_addr_signal(msk, remaining, &saddr, &echo))) return false; - len = mptcp_add_addr_len(saddr.family); + len = mptcp_add_addr_len(saddr.family, echo); if (remaining < len) return false; diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 7e81f53d1e5d..e19e1525ecbb 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -183,11 +183,12 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining, if (!mptcp_pm_should_add_signal(msk)) goto out_unlock; - if (remaining < mptcp_add_addr_len(msk->pm.local.family)) + *echo = READ_ONCE(msk->pm.add_addr_echo); + + if (remaining < mptcp_add_addr_len(msk->pm.local.family, *echo)) goto out_unlock; *saddr = msk->pm.local; - *echo = READ_ONCE(msk->pm.add_addr_echo); WRITE_ONCE(msk->pm.add_addr_signal, false); ret = true; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index a47307c82831..aa0ab18d2e57 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -464,11 +464,12 @@ static inline bool mptcp_pm_should_rm_signal(struct mptcp_sock *msk) return READ_ONCE(msk->pm.rm_addr_signal); } -static inline unsigned int mptcp_add_addr_len(int family) +static inline unsigned int mptcp_add_addr_len(int family, bool echo) { if (family == AF_INET) - return TCPOLEN_MPTCP_ADD_ADDR; - return TCPOLEN_MPTCP_ADD_ADDR6; + return echo ? TCPOLEN_MPTCP_ADD_ADDR_BASE + : TCPOLEN_MPTCP_ADD_ADDR; + return echo ? TCPOLEN_MPTCP_ADD_ADDR6_BASE : TCPOLEN_MPTCP_ADD_ADDR6; } bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
The MPTCP ADD_ADDR suboption with echo-flag=1 has no HMAC, the size is smaller than the one initially sent without echo-flag=1. We then need to use the correct size not to send a packet with the wrong TCP option lenght and containing garbage at the end. Fixes: 6a6c05a8b016 ("mptcp: send out ADD_ADDR with echo flag") Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/95 Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> --- net/mptcp/options.c | 2 +- net/mptcp/pm.c | 5 +++-- net/mptcp/protocol.h | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-)