summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Lingfeng <lilingfeng3@huawei.com>2024-09-04 15:34:57 +0300
committerAnna Schumaker <anna.schumaker@oracle.com>2024-09-23 22:03:12 +0300
commit8f6a7c9467eaf39da4c14e5474e46190ab3fb529 (patch)
tree275c80ee12f77969f41ba0fcdd05947838f25f99
parent8c04a6d6e07ce565928ea98ae8c534cac871af19 (diff)
downloadlinux-8f6a7c9467eaf39da4c14e5474e46190ab3fb529.tar.xz
nfs: fix memory leak in error path of nfs4_do_reclaim
Commit c77e22834ae9 ("NFSv4: Fix a potential sleep while atomic in nfs4_do_reclaim()") separate out the freeing of the state owners from nfs4_purge_state_owners() and finish it outside the rcu lock. However, the error path is omitted. As a result, the state owners in "freeme" will not be released. Fix it by adding freeing in the error path. Fixes: c77e22834ae9 ("NFSv4: Fix a potential sleep while atomic in nfs4_do_reclaim()") Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com> Cc: stable@vger.kernel.org # v5.3+ Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
-rw-r--r--fs/nfs/nfs4state.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 877f682b45f2..30aba1dedaba 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1957,6 +1957,7 @@ restart:
set_bit(ops->owner_flag_bit, &sp->so_flags);
nfs4_put_state_owner(sp);
status = nfs4_recovery_handle_error(clp, status);
+ nfs4_free_state_owners(&freeme);
return (status != 0) ? status : -EAGAIN;
}