Commit db87668a authored Apr 10, 2020 by Xin Long Committed by Steffen Klassert Apr 20, 2020

xfrm: remove the xfrm_state_put call becofe going to out_reset



This xfrm_state_put call in esp4/6_gro_receive() will cause
double put for state, as in out_reset path secpath_reset()
will put all states set in skb sec_path.

So fix it by simply remove the xfrm_state_put call.

Fixes: 6ed69184 ("xfrm: Reset secpath in xfrm failure")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

parent 3c96ec56

net/ipv4/esp4_offload.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -63,11 +63,9 @@ static struct sk_buff esp4_gro_receive(struct list_head head,
		sp->olen++;

		xo = xfrm_offload(skb);
		if (!xo) {
		xfrm_state_put(x);
		if (!xo)
		goto out_reset;
		}
		}

		xo->flags \|= XFRM_GRO;

net/ipv6/esp6_offload.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -85,11 +85,9 @@ static struct sk_buff esp6_gro_receive(struct list_head head,
		sp->olen++;

		xo = xfrm_offload(skb);
		if (!xo) {
		xfrm_state_put(x);
		if (!xo)
		goto out_reset;
		}
		}

		xo->flags \|= XFRM_GRO;

Admin message