sunrpc: Fix potential leaks in sunrpc_cache_unhash()

[ Upstream commit 1d82163714c16ebe09c7a8c9cd3cef7abcc16208 ]

When we unhash the cache entry, we need to handle any pending upcalls
by calling cache_fresh_unlocked().

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index f740cb51802af8f2bb12a49031df172eea0f7da8..7ede1e52fd812e9c91f90301c3af827b0c3ff27b 100644 (file)
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -1888,7 +1888,9 @@ void sunrpc_cache_unhash(struct cache_detail *cd, struct cache_head *h)
        if (!hlist_unhashed(&h->cache_list)){
                hlist_del_init_rcu(&h->cache_list);
                cd->entries--;
+               set_bit(CACHE_CLEANED, &h->flags);
                spin_unlock(&cd->hash_lock);
+               cache_fresh_unlocked(h, cd);
                cache_put(h, cd);
        } else
                spin_unlock(&cd->hash_lock);