| Message ID | ZzXZ0BaL9ypZ1ilY@gauss3.secunet.de (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [ipsec-next] xfrm: Fix acquire state insertion. | expand |
On Thu, Nov 14, 2024 at 12:06:56PM +0100, Steffen Klassert wrote: > 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> > Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> Reviewed-by: Simon Horman <horms@kernel.org>
On Thu, Nov 14, 2024 at 06:11:38PM +0000, Simon Horman wrote: > On Thu, Nov 14, 2024 at 12:06:56PM +0100, Steffen Klassert wrote: > > 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> > > Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> > > Reviewed-by: Simon Horman <horms@kernel.org> This is now applied to ipsec-next. Thanks for the review Simon!
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index e3266a5d4f90..67ca7ac955a3 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -1470,6 +1470,7 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr, 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);
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> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> --- net/xfrm/xfrm_state.c | 1 + 1 file changed, 1 insertion(+)