kevin/linux
1
Fork 0
Code

NFSD: Initialize struct nfsd4_copy earlier

Browse Source 
Ensure the refcount and async_copies fields are initialized early.
cleanup_async_copy() will reference these fields if an error occurs
in nfsd4_copy(). If they are not correctly initialized, at the very
least, a refcount underflow occurs.

Reported-by: Olga Kornievskaia <okorniev@redhat.com>
Fixes: aadc3bbea1 ("NFSD: Limit the number of concurrent async COPY operations")
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Tested-by: Olga Kornievskaia <okorniev@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2024-10-26 12:02:38 -04:00
parent d5ff2fb2e7
commit 63fab04cbd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfsd/nfs4proc.c
View File

@ -1841,14 +1841,14 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
if (!async_copy) if (!async_copy)
goto out_err; goto out_err;
async_copy->cp_nn = nn; async_copy->cp_nn = nn;
INIT_LIST_HEAD(&async_copy->copies);
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); atomic_dec(&nn->pending_async_copies);
goto out_err; goto out_err;
} }
INIT_LIST_HEAD(&async_copy->copies);
refcount_set(&async_copy->refcount, 1);
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;