Skip to content

Commit 019805f

Browse files
daimngochucklever
authored andcommitted
NFSD: fix use-after-free on source server when doing inter-server copy
Use-after-free occurred when the laundromat tried to free expired cpntf_state entry on the s2s_cp_stateids list after inter-server copy completed. The sc_cp_list that the expired copy state was inserted on was already freed. When COPY completes, the Linux client normally sends LOCKU(lock_state x), FREE_STATEID(lock_state x) and CLOSE(open_state y) to the source server. The nfs4_put_stid call from nfsd4_free_stateid cleans up the copy state from the s2s_cp_stateids list before freeing the lock state's stid. However, sometimes the CLOSE was sent before the FREE_STATEID request. When this happens, the nfsd4_close_open_stateid call from nfsd4_close frees all lock states on its st_locks list without cleaning up the copy state on the sc_cp_list list. When the time the FREE_STATEID arrives the server returns BAD_STATEID since the lock state was freed. This causes the use-after-free error to occur when the laundromat tries to free the expired cpntf_state. This patch adds a call to nfs4_free_cpntf_statelist in nfsd4_close_open_stateid to clean up the copy state before calling free_ol_stateid_reaplist to free the lock state's stid on the reaplist. Signed-off-by: Dai Ngo <[email protected]> Signed-off-by: Chuck Lever <[email protected]>
1 parent 76ce4dc commit 019805f

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

fs/nfsd/nfs4state.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,6 +1060,7 @@ static struct nfs4_ol_stateid * nfs4_alloc_open_stateid(struct nfs4_client *clp)
10601060

10611061
static void nfs4_free_deleg(struct nfs4_stid *stid)
10621062
{
1063+
WARN_ON(!list_empty(&stid->sc_cp_list));
10631064
kmem_cache_free(deleg_slab, stid);
10641065
atomic_long_dec(&num_delegations);
10651066
}
@@ -1473,6 +1474,7 @@ static void nfs4_free_ol_stateid(struct nfs4_stid *stid)
14731474
release_all_access(stp);
14741475
if (stp->st_stateowner)
14751476
nfs4_put_stateowner(stp->st_stateowner);
1477+
WARN_ON(!list_empty(&stid->sc_cp_list));
14761478
kmem_cache_free(stateid_slab, stid);
14771479
}
14781480

@@ -6799,6 +6801,7 @@ static void nfsd4_close_open_stateid(struct nfs4_ol_stateid *s)
67996801
struct nfs4_client *clp = s->st_stid.sc_client;
68006802
bool unhashed;
68016803
LIST_HEAD(reaplist);
6804+
struct nfs4_ol_stateid *stp;
68026805

68036806
spin_lock(&clp->cl_lock);
68046807
unhashed = unhash_open_stateid(s, &reaplist);
@@ -6807,6 +6810,8 @@ static void nfsd4_close_open_stateid(struct nfs4_ol_stateid *s)
68076810
if (unhashed)
68086811
put_ol_stateid_locked(s, &reaplist);
68096812
spin_unlock(&clp->cl_lock);
6813+
list_for_each_entry(stp, &reaplist, st_locks)
6814+
nfs4_free_cpntf_statelist(clp->net, &stp->st_stid);
68106815
free_ol_stateid_reaplist(&reaplist);
68116816
} else {
68126817
spin_unlock(&clp->cl_lock);

0 commit comments

Comments
 (0)