Message ID | 45c05c0028fd9bbd42893966caee2a314af91bab.1685950471.git.leonro@nvidia.com (mailing list archive) |
---|---|
State | Awaiting Upstream |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [ipsec-rc] xfrm: add missed call to delete offloaded policies | expand |
On Mon, Jun 05, 2023 at 10:36:15AM +0300, Leon Romanovsky wrote: > From: Leon Romanovsky <leonro@nvidia.com> > > Offloaded policies are deleted through two flows: netdev is going > down and policy flush. > > In both cases, the code lacks relevant call to delete offloaded policy. > > Fixes: 919e43fad516 ("xfrm: add an interface to offload policy") > Signed-off-by: Leon Romanovsky <leonro@nvidia.com> Reviewed-by: Simon Horman <simon.horman@corigine.com>
On Tue, Jun 06, 2023 at 11:06:18AM +0200, Simon Horman wrote: > On Mon, Jun 05, 2023 at 10:36:15AM +0300, Leon Romanovsky wrote: > > From: Leon Romanovsky <leonro@nvidia.com> > > > > Offloaded policies are deleted through two flows: netdev is going > > down and policy flush. > > > > In both cases, the code lacks relevant call to delete offloaded policy. > > > > Fixes: 919e43fad516 ("xfrm: add an interface to offload policy") > > Signed-off-by: Leon Romanovsky <leonro@nvidia.com> > > Reviewed-by: Simon Horman <simon.horman@corigine.com> Applied, thanks everyone!
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 6d15788b5123..6dcc714a9258 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -1831,6 +1831,7 @@ int xfrm_policy_flush(struct net *net, u8 type, bool task_valid) __xfrm_policy_unlink(pol, dir); spin_unlock_bh(&net->xfrm.xfrm_policy_lock); + xfrm_dev_policy_delete(pol); cnt++; xfrm_audit_policy_delete(pol, 1, task_valid); xfrm_policy_kill(pol); @@ -1869,6 +1870,7 @@ int xfrm_dev_policy_flush(struct net *net, struct net_device *dev, __xfrm_policy_unlink(pol, dir); spin_unlock_bh(&net->xfrm.xfrm_policy_lock); + xfrm_dev_policy_delete(pol); cnt++; xfrm_audit_policy_delete(pol, 1, task_valid); xfrm_policy_kill(pol);