From: Li Lingfeng Date: Wed, 4 Sep 2024 12:34:57 +0000 (+0800) Subject: nfs: fix memory leak in error path of nfs4_do_reclaim X-Git-Tag: v6.12-rc1~56^2~40 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f6a7c9467eaf39da4c14e5474e46190ab3fb529;p=thirdparty%2Flinux.git 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 Cc: stable@vger.kernel.org # v5.3+ Signed-off-by: Anna Schumaker --- diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 877f682b45f2d..30aba1dedaba6 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; }