From mboxrd@z Thu Jan 1 00:00:00 1970 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 184FC3B6343; Tue, 5 May 2026 04:32:46 +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=1777955568; cv=none; b=Wb23ruYzZZwr6kvZLV+pLBno0on4BG+HYJP7WJbh5wGH18s8uG3DNiu8JAcX/S+k8tZZbhGbNxLamBB7ulm0jwkHJoP+s7zqijriu7qkR8UUlTxp7+C8XTRMza7ADC/vcOgOwPGfs4D4+bCmyANDtILM60DhATSmmRwz1xtElgc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777955568; c=relaxed/simple; bh=49g84C5e27xWI5w57FSsl7o33PDeloPsZ3/EHnIpCXE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KdUVkZHHKzKYQ2SHresj2nU/ZO8mFXm+aaIASIpJLXH7r8CJ4wupqgByHLSxmT0MtyaE+DwQ9irprrVC6TiIUiP5YrvPu3+sytZqbLUzuracWW0sGvQnFyOYXQOIisSVMDcP8mkN7YgsF7vvXry1yPPqsrjypIIliD0Q/5GGAnc= 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=rIQOIJG/; 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="rIQOIJG/" Received: from localhost (localhost [127.0.0.1]) by mx1.secunet.com (Postfix) with ESMTP id 55E15201E4; Tue, 5 May 2026 06:32:45 +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 1pnPuBo3xkCL; Tue, 5 May 2026 06:32:44 +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 C1F34201AE; Tue, 5 May 2026 06:32:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.secunet.com C1F34201AE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secunet.com; s=202301; t=1777955564; bh=7CqdPBhSulQ3gVqcaCWA5Os/krQsejXNpbAi0HmMp4w=; h=From:To:CC:Subject:Date:In-Reply-To:References:From; b=rIQOIJG/ikhk3gmKrzCn4OVo05cVCOvHpjmgZY+PhGUJBKdoaS/xedc3LLGn/igqh DQM/DYBkzXs5q3Vb+PsSxMqCVmvCmj2XeASsUw5OuwNBcddQul/Kl+hrSETdMOI5FW EJvUaaHCLiYCG2rBRu5pwh7EKczNnYNPcEfQedUuE70WgYlKnMjwIyY4z5Tp2iyvHb KjkAa2SZmAObDaYEK/afgY7j3x//Rw6VFD1V5sz2OjQVw/iUv602SfSoaiVfy6vUvd a8e33FU6xaqDGbg+lrY/TABbItgrKaFizCaAl02AgV5YCW4ZOFHsH60QDLb7g60KfM +FBKeMZSrf8kA== 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; Tue, 5 May 2026 06:32:42 +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: Sabrina Dubroca , , , , , Chiachang Wang , Yan Yan , Subject: [PATCH ipsec-next v8 03/14] xfrm: allow migration from UDP encapsulated to non-encapsulated ESP Date: Tue, 5 May 2026 06:32:30 +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: 8bit 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=NULL 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 53d88b87bdbd..933541bc9093 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 = orig->props.calgo; - if (encap || orig->encap) { - if (encap) - x->encap = kmemdup(encap, sizeof(*x->encap), - GFP_KERNEL); - else - x->encap = kmemdup(orig->encap, sizeof(*x->encap), - GFP_KERNEL); - + if (encap) { + x->encap = kmemdup(encap, sizeof(*x->encap), GFP_KERNEL); if (!x->encap) goto error; } -- 2.47.3