[SRU][N][PATCH 1/1] UBUNTU: SAUCE: Revert "xfrm: fix NAT-related field inheritance in SA migration"

[Manuel Diewald]

BugLink: https://bugs.launchpad.net/bugs/2169329

This reverts commit 0c7e5c594b704920d50e02b774d9f562e2903491.

This upstream stable patch from v6.12.97

7c30d7f1ba651 ("xfrm: fix NAT-related field inheritance in SA migration")

should not have been included in noble because we're missing

f531d13bdfe3f ("xfrm: support sending NAT keepalives in ESP in UDP states")

which causes the following build failure when CONFIG_XFRM_MIGRATE is
turned on:

error: 'struct xfrm_state' has no member named 'nat_keepalive_interval'

This issue was initially overlooked because the patch applied cleanly
and we have CONFIG_XFRM_MIGRATE turned off for the generic kernel in
noble so build tests didn't trigger the problem. The mapping_maxage part
of the patch is also technically applicable to noble but not worth
keeping as a partial backport.

Signed-off-by: Manuel Diewald <manuel.diewald at canonical.com>
---
 net/xfrm/xfrm_state.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 113cc69b16f60..fec8034dd4db4 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1958,8 +1958,6 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig,
 
 		if (!x->encap)
 			goto error;
-		x->mapping_maxage = orig->mapping_maxage;
-		x->nat_keepalive_interval = orig->nat_keepalive_interval;
 	}
 
 	if (orig->security)
@@ -1994,6 +1992,7 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig,
 	x->km.seq = orig->km.seq;
 	x->replay = orig->replay;
 	x->preplay = orig->preplay;
+	x->mapping_maxage = orig->mapping_maxage;
 	x->lastused = orig->lastused;
 	x->new_mapping = 0;
 	x->new_mapping_sport = 0;
-- 
2.34.1