* [PATCH ipsec] xfrm: remove the xfrm_state_put call becofe going to out_reset
@ 2020-04-10 9:08 Xin Long
2020-04-20 10:39 ` Steffen Klassert
0 siblings, 1 reply; 2+ messages in thread
From: Xin Long @ 2020-04-10 9:08 UTC (permalink / raw)
To: netdev; +Cc: Steffen Klassert, Herbert Xu, David S. Miller, Sabrina Dubroca
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: 6ed69184ed9c ("xfrm: Reset secpath in xfrm failure")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
net/ipv4/esp4_offload.c | 4 +---
net/ipv6/esp6_offload.c | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/net/ipv4/esp4_offload.c b/net/ipv4/esp4_offload.c
index 9dde4e3..785baf2 100644
--- a/net/ipv4/esp4_offload.c
+++ b/net/ipv4/esp4_offload.c
@@ -63,10 +63,8 @@ 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;
diff --git a/net/ipv6/esp6_offload.c b/net/ipv6/esp6_offload.c
index 021f58c..4c4f7a0 100644
--- a/net/ipv6/esp6_offload.c
+++ b/net/ipv6/esp6_offload.c
@@ -85,10 +85,8 @@ 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;
--
2.1.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH ipsec] xfrm: remove the xfrm_state_put call becofe going to out_reset
2020-04-10 9:08 [PATCH ipsec] xfrm: remove the xfrm_state_put call becofe going to out_reset Xin Long
@ 2020-04-20 10:39 ` Steffen Klassert
0 siblings, 0 replies; 2+ messages in thread
From: Steffen Klassert @ 2020-04-20 10:39 UTC (permalink / raw)
To: Xin Long; +Cc: netdev, Herbert Xu, David S. Miller, Sabrina Dubroca
On Fri, Apr 10, 2020 at 05:08:24PM +0800, Xin Long wrote:
> 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: 6ed69184ed9c ("xfrm: Reset secpath in xfrm failure")
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
Also applied, thanks a lot Xin!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-20 10:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-10 9:08 [PATCH ipsec] xfrm: remove the xfrm_state_put call becofe going to out_reset Xin Long
2020-04-20 10:39 ` Steffen Klassert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).