From nobody Mon Apr 13 04:24:37 2026 Received: from mx1.secunet.com (mx1.secunet.com [62.96.220.36]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D54AF2D7DDB; Sun, 12 Apr 2026 11:14:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=62.96.220.36 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775992495; cv=none; b=bS91l40e5ZFGGDRx3AaaTZ1qif0/8uBjTmzVR8Q07PkVv0b4OeuNCTjFToa8m4dwdpK+w0LTJXbpqnSfFf0Et04YKPHhO1X+AIqXTVM2Hz6Oji/5731X7KnSupGNS6r+SKCiTwxoqR0nUwX/BzPbR1g5afWeN4JKAU4d9HiCvas= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775992495; c=relaxed/simple; bh=j+k2tUcpHU32NYHbyKzX77TP2YHk4uwlRjIhKZUdEh4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rZGqnl6XJHMF79sJNE0VTaJSfEhvB60JCgL6RcFkilw3oAE6b6eTS8FURRc0D0BkANt08ZqPcXl2zKXMWR3Z7GbyEaEUK1ljNjY7lkej3Xt8tDVupBtvNax63gV1lKnpC5v8955HxNXT2E2vPuxD0XjYfM1ts/+4KGZBpZyrXRk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=secunet.com; spf=pass smtp.mailfrom=secunet.com; dkim=pass (2048-bit key) header.d=secunet.com header.i=@secunet.com header.b=IfHOngpg; arc=none smtp.client-ip=62.96.220.36 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=secunet.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=secunet.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=secunet.com header.i=@secunet.com header.b="IfHOngpg" Received: from localhost (localhost [127.0.0.1]) by mx1.secunet.com (Postfix) with ESMTP id 1561420799; Sun, 12 Apr 2026 13:14:52 +0200 (CEST) X-Virus-Scanned: by secunet Received: from mx1.secunet.com ([127.0.0.1]) by localhost (mx1.secunet.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id o-rrfcj1yOrE; Sun, 12 Apr 2026 13:14:50 +0200 (CEST) Received: from EXCH-02.secunet.de (rl2.secunet.de [10.32.0.232]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.secunet.com (Postfix) with ESMTPS id 7C3582076B; Sun, 12 Apr 2026 13:14:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.secunet.com 7C3582076B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secunet.com; s=202301; t=1775992490; bh=auB+c6mZikAg6O0+lm8xKRB2Ctm5ljZx2s/M/uCDQGw=; h=From:To:CC:Subject:Date:In-Reply-To:References:From; b=IfHOngpgEeVGm4W+D6LQ2+ZqIejSbqBxeMry7FWycq3VxpypO9bDYSGObFKqKJpUb liR1PUzkoMMAOtL5Qo67sei4I27F+VYYmimFM5TMXqI3LCV4M6gp2zzOuSqHyfWImL 4CE78o/rzluNq0xO57X5SV7SECHNxB0OGTrrfVXwl42q4qXFG6Pyew0BCClVDr+zeS s9xqWTD4MaPp8WQlMJredMzMR0vfO74ZOJuGNfHmlWz7rtA/gVsrU4/waoPooj+/Ne njYD7MOTe/FxkovfVFjr8u63Q4fMf2PPCS8qBJQJJ7jgz4Ke+cuV2bXu3L6WFmGuHM HKA6DnyGxszCw== Received: from moon.secunet.de (172.18.149.1) by EXCH-02.secunet.de (10.32.0.172) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Sun, 12 Apr 2026 13:14:49 +0200 From: Antony Antony To: Antony Antony , Steffen Klassert , Herbert Xu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern , Masahide NAKAMURA , Paul Moore , Stephen Smalley , Ondrej Mosnacek , Jonathan Corbet , Shuah Khan CC: , , , , Chiachang Wang , Yan Yan , Subject: [PATCH ipsec-next v7 03/14] xfrm: allow migration from UDP encapsulated to non-encapsulated ESP Date: Sun, 12 Apr 2026 13:14:40 +0200 Message-ID: X-Mailer: git-send-email 2.39.5 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.15-dev Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: EXCH-01.secunet.de (10.32.0.171) To EXCH-02.secunet.de (10.32.0.172) The current code prevents migrating an SA from UDP encapsulation to plain ESP. This is needed when moving from a NATed path to a non-NATed one, for example when switching from IPv4+NAT to IPv6. Only copy the existing encapsulation during migration if the encap attribute is explicitly provided. Note: PF_KEY's SADB_X_MIGRATE always passes encap=3DNULL and never supported encapsulation in migration. PF_KEY is deprecated and was in feature freeze when UDP encapsulation was added to xfrm. Signed-off-by: Antony Antony Tested-by: Yan Yan --- net/xfrm/xfrm_state.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 86f21a19a0ee..20ebd10dbee5 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -2008,14 +2008,8 @@ static struct xfrm_state *xfrm_state_clone_and_setup= (struct xfrm_state *orig, } x->props.calgo =3D orig->props.calgo; =20 - if (encap || orig->encap) { - if (encap) - x->encap =3D kmemdup(encap, sizeof(*x->encap), - GFP_KERNEL); - else - x->encap =3D kmemdup(orig->encap, sizeof(*x->encap), - GFP_KERNEL); - + if (encap) { + x->encap =3D kmemdup(encap, sizeof(*x->encap), GFP_KERNEL); if (!x->encap) goto error; } --=20 2.47.3