kevin/linux
1
Fork 0
Code

NFSD: Never decrement pending_async_copies on error

Browse Source 
The error flow in nfsd4_copy() calls cleanup_async_copy(), which
already decrements nn->pending_async_copies.

Reported-by: Olga Kornievskaia <okorniev@redhat.com>
Fixes: aadc3bbea1 ("NFSD: Limit the number of concurrent async COPY operations")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2024-10-29 15:27:19 -04:00
parent 63fab04cbd
commit 8286f8b622
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfsd/nfs4proc.c
View File

@ -1845,10 +1845,8 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
refcount_set(&async_copy->refcount, 1); refcount_set(&async_copy->refcount, 1);
/* Arbitrary cap on number of pending async copy operations */ /* Arbitrary cap on number of pending async copy operations */
if (atomic_inc_return(&nn->pending_async_copies) > if (atomic_inc_return(&nn->pending_async_copies) >
(int)rqstp->rq_pool->sp_nrthreads) { (int)rqstp->rq_pool->sp_nrthreads)
atomic_dec(&nn->pending_async_copies);
goto out_err; goto out_err;
}
async_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL); async_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL);
if (!async_copy->cp_src) if (!async_copy->cp_src)
goto out_err; goto out_err;