From patchwork Tue Oct 27 13:44:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 312549 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40139C83024 for ; Tue, 27 Oct 2020 15:43:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 062042242B for ; Tue, 27 Oct 2020 15:43:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603813424; bh=plV74ACRqJ0VnjFZjAIsVTWYzSWS5YeylkC4Puqi540=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lxxw5sFw96dTn3mxBzHVxs24FBhua1g4s6SAZ4qZMezC7UbcD+kUZnCstnnq12V5n EZZURukj9ayK8zE8yFMY82e1AiJuQM35Pj93cVYrB/gNMzHr1GG4ZGJWJ6m3AnED9Y 8INQFSyTSC2McCegTsJFbNzV5u/ypYKGuunqv/IM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1798514AbgJ0P20 (ORCPT ); Tue, 27 Oct 2020 11:28:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:35566 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1797006AbgJ0PVE (ORCPT ); Tue, 27 Oct 2020 11:21:04 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1825921527; Tue, 27 Oct 2020 15:21:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812063; bh=plV74ACRqJ0VnjFZjAIsVTWYzSWS5YeylkC4Puqi540=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vvEOrPKgJ6PA11G0tTe8eiG4N9awEfX7iPTlstk2A0IASXUoD8edocJd57dCMyODe ov2JozQ1uAzkALt7jdQlOcRUSEfsfskzi+vfwF+3EJQOMULktqZtjLj79G1D9YlW8k MOSf/cDCMPwcASI25svsBgk3JucbgprZJp3KyPLU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Geliang Tang , Matthieu Baerts , Jakub Kicinski Subject: [PATCH 5.9 039/757] mptcp: initialize mptcp_options_receiveds ahmac Date: Tue, 27 Oct 2020 14:44:49 +0100 Message-Id: <20201027135452.357685293@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Geliang Tang [ 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 Reviewed-by: Matthieu Baerts Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/mptcp/options.c | 1 + 1 file changed, 1 insertion(+) --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -296,6 +296,7 @@ void mptcp_get_options(const struct sk_b 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;