shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

NFSD: Never decrement pending_async_copies on error

Browse Source 
[ Upstream commit 8286f8b622990194207df9ab852e0f87c60d35e9 ]

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: aadc3bbea163 ("NFSD: Limit the number of concurrent async COPY operations")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chuck Lever
2024-11-18 16:19:00 -05:00
committed by Greg Kroah-Hartman
parent c3074003fa
commit 949ee5d44d
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfsd/nfs4proc.c
View File

@@ -1790,10 +1790,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;