From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 088F3C433FE for ; Wed, 9 Mar 2022 16:25:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231327AbiCIQ0D (ORCPT ); Wed, 9 Mar 2022 11:26:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238171AbiCIQVa (ORCPT ); Wed, 9 Mar 2022 11:21:30 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CC89148930; Wed, 9 Mar 2022 08:20:04 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 2D5B0B82221; Wed, 9 Mar 2022 16:20:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 079E0C340F4; Wed, 9 Mar 2022 16:19:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646842801; bh=UqwiPp2qBmb+7tKFdE0+ShqjTMU9taITEwrPGtd63H8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DDGcuyCE5ZhPqxGu8+Ob3cYd37b7gDEYOvj4+XyN4PsSb1wyMEkvwztcKeRFxvDf/ MGPcu8yWVNMuijaOzxhearyZn/uczWWfHycf775w96N5rZ4m5/UPKjTWtFSjfiT01A wH+O1xkeR/KRiHkN27kNSTl5/Gvnj1G8PgSfWmLH4g6MWhxqJRrZqpsEc1ZhI/VhTp PuDZCDbuG7hpr7JkXQtjFZeVmnC1U889fnlWTPhNnlu+lBWtXbUta8u0OLFSb7rH1Z 5vKlQs1Uh0AKgHgXVYmaGWxElUJbF1YUnpN2b8uOnbUVlmPLGf/6PbxVVEQgdrSu9x eWQYBRKqR/m4w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yan Yan , Steffen Klassert , Sasha Levin , davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 03/24] xfrm: Fix xfrm migrate issues when address family changes Date: Wed, 9 Mar 2022 11:19:22 -0500 Message-Id: <20220309161946.136122-3-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220309161946.136122-1-sashal@kernel.org> References: <20220309161946.136122-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Yan Yan [ Upstream commit e03c3bba351f99ad932e8f06baa9da1afc418e02 ] xfrm_migrate cannot handle address family change of an xfrm_state. The symptons are the xfrm_state will be migrated to a wrong address, and sending as well as receiving packets wil be broken. This commit fixes it by breaking the original xfrm_state_clone method into two steps so as to update the props.family before running xfrm_init_state. As the result, xfrm_state's inner mode, outer mode, type and IP header length in xfrm_state_migrate can be updated with the new address family. Tested with additions to Android's kernel unit test suite: https://android-review.googlesource.com/c/kernel/tests/+/1885354 Signed-off-by: Yan Yan Signed-off-by: Steffen Klassert Signed-off-by: Sasha Levin --- net/xfrm/xfrm_state.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 291236d7676f..f7bfa1916968 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -1578,9 +1578,6 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, memcpy(&x->mark, &orig->mark, sizeof(x->mark)); memcpy(&x->props.smark, &orig->props.smark, sizeof(x->props.smark)); - if (xfrm_init_state(x) < 0) - goto error; - x->props.flags = orig->props.flags; x->props.extra_flags = orig->props.extra_flags; @@ -1667,6 +1664,11 @@ struct xfrm_state *xfrm_state_migrate(struct xfrm_state *x, if (!xc) return NULL; + xc->props.family = m->new_family; + + if (xfrm_init_state(xc) < 0) + goto error; + memcpy(&xc->id.daddr, &m->new_daddr, sizeof(xc->id.daddr)); memcpy(&xc->props.saddr, &m->new_saddr, sizeof(xc->props.saddr)); -- 2.34.1