diff options
| author | Leon Romanovsky <leonro@nvidia.com> | 2023-07-31 14:38:27 +0300 |
|---|---|---|
| committer | Steffen Klassert <steffen.klassert@secunet.com> | 2023-08-01 12:04:43 +0200 |
| commit | f3ec2b5d879ef5bbcb24678914641343cb6399a2 (patch) | |
| tree | e9dd2fb2ebc630b44cb3aff9b16e300bd25ff122 /net/xfrm | |
| parent | 982c3aca8bac8ae38acdc940e4f1ecec3bffc623 (diff) | |
| download | linux-f3ec2b5d879ef5bbcb24678914641343cb6399a2.tar.gz linux-f3ec2b5d879ef5bbcb24678914641343cb6399a2.tar.bz2 linux-f3ec2b5d879ef5bbcb24678914641343cb6399a2.zip | |
xfrm: don't skip free of empty state in acquire policy
In destruction flow, the assignment of NULL to xso->dev
caused to skip of xfrm_dev_state_free() call, which was
called in xfrm_state_put(to_put) routine.
Instead of open-coded variant of xfrm_dev_state_delete() and
xfrm_dev_state_free(), let's use them directly.
Fixes: f8a70afafc17 ("xfrm: add TX datapath support for IPsec packet offload mode")
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_state.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 49e63eea841d..bda5327bf34d 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -1324,12 +1324,8 @@ found: struct xfrm_dev_offload *xso = &x->xso; if (xso->type == XFRM_DEV_OFFLOAD_PACKET) { - xso->dev->xfrmdev_ops->xdo_dev_state_delete(x); - xso->dir = 0; - netdev_put(xso->dev, &xso->dev_tracker); - xso->dev = NULL; - xso->real_dev = NULL; - xso->type = XFRM_DEV_OFFLOAD_UNSPECIFIED; + xfrm_dev_state_delete(x); + xfrm_dev_state_free(x); } #endif x->km.state = XFRM_STATE_DEAD; |