From: Geliang Tang <geliangtang@gmail.com>
Date: Mon, 19 Oct 2020 10:23:15 +0000 (+0800)
Subject: mptcp: initialize mptcp_options_received's ahmac
X-Git-Tag: v5.8.17~593
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f0afe20ababb11791505ef301878569a3af7c20;p=thirdparty%2Fkernel%2Fstable.git

mptcp: initialize mptcp_options_received's ahmac

[ Upstream commit fe2d9b1a0e7805384770ec0ddd34c9f1e9fe6fa8 ]

Initialize mptcp_options_received's ahmac to zero, otherwise it
will be a random number when receiving ADD_ADDR suboption with echo-flag=1.

Fixes: 3df523ab582c5 ("mptcp: Add ADD_ADDR handling")
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 77d46cc8165bc..430a9213a7bf9 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -296,6 +296,7 @@ void mptcp_get_options(const struct sk_buff *skb,
 	mp_opt->mp_capable = 0;
 	mp_opt->mp_join = 0;
 	mp_opt->add_addr = 0;
+	mp_opt->ahmac = 0;
 	mp_opt->rm_addr = 0;
 	mp_opt->dss = 0;