1 files changed, 6 insertions, 2 deletions

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index c9d6a5f1348d..9fa3322b2a7d 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -603,13 +603,14 @@ xfrm_state_flush_secctx_check(struct net *net, u8 proto, struct xfrm_audit *audi
 
 int xfrm_state_flush(struct net *net, u8 proto, struct xfrm_audit *audit_info)
 {
-        int i, err = 0;
+        int i, err = 0, cnt = 0;
 
         spin_lock_bh(&xfrm_state_lock);
         err = xfrm_state_flush_secctx_check(net, proto, audit_info);
         if (err)
                 goto out;
 
+        err = -ESRCH;
         for (i = 0; i <= net->xfrm.state_hmask; i++) {
                 struct hlist_node *entry;
                 struct xfrm_state *x;
@@ -626,13 +627,16 @@ restart:
                                                         audit_info->sessionid,
                                                         audit_info->secid);
                                 xfrm_state_put(x);
+                                if (!err)
+                                        cnt++;
 
                                 spin_lock_bh(&xfrm_state_lock);
                                 goto restart;
                         }
                 }
         }
-        err = 0;
+        if (cnt)
+                err = 0;
 
 out:
         spin_unlock_bh(&xfrm_state_lock);