From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Thu, 14 Nov 2024 11:06:56 +0000 (+0100)
Subject: xfrm: Fix acquire state insertion.
X-Git-Tag: v6.13-rc1~135^2~23^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a35672819f8d85e2ae38b80d40b923e3ef81e4ea;p=thirdparty%2Flinux.git

xfrm: Fix acquire state insertion.

A recent commit jumped over the dst hash computation and
left the symbol uninitialized. Fix this by explicitly
computing the dst hash before it is used.

Fixes: 0045e3d80613 ("xfrm: Cache used outbound xfrm states at the policy.")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index e3266a5d4f90d..67ca7ac955a37 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1470,6 +1470,7 @@ found:
 			x->km.state = XFRM_STATE_ACQ;
 			x->dir = XFRM_SA_DIR_OUT;
 			list_add(&x->km.all, &net->xfrm.state_all);
+			h = xfrm_dst_hash(net, daddr, saddr, tmpl->reqid, encap_family);
 			XFRM_STATE_INSERT(bydst, &x->bydst,
 					  net->xfrm.state_bydst + h,
 					  x->xso.type);