Skip to content

Commit 10d3b82

Browse files
committed
Merge: NFSD: Force all NFSv4.2 COPY requests to be synchronous
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5660 JIRA: https://issues.redhat.com/browse/RHEL-64496 CVE: CVE-2024-49974 We are not including the patch highlighted in the CVE ("NFSD: Limit the number of concurrent async COPY operations"). Instead, we're addressing the CVE by including an upstream fix that disables async copy because the fix for async copy upstream is still incomplete. Once the async copy support has been completely fixed upstream, we will include the upstream patch that re-enables it in RHEL and include all the fixes. Signed-off-by: Olga Kornievskaia <okorniev@redhat.com> Approved-by: Scott Mayhew <smayhew@redhat.com> Approved-by: Benjamin Coddington <bcodding@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Rado Vrbovsky <rvrbovsk@redhat.com>
2 parents 5b365e7 + 4678d1e commit 10d3b82

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

fs/nfsd/nfs4proc.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1828,6 +1828,13 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
18281828
__be32 status;
18291829
struct nfsd4_copy *async_copy = NULL;
18301830

1831+
/*
1832+
* Currently, async COPY is not reliable. Force all COPY
1833+
* requests to be synchronous to avoid client application
1834+
* hangs waiting for COPY completion.
1835+
*/
1836+
nfsd4_copy_set_sync(copy, true);
1837+
18311838
copy->cp_clp = cstate->clp;
18321839
if (nfsd4_ssc_is_inter(copy)) {
18331840
trace_nfsd_copy_inter(copy);

0 commit comments

Comments
 (0)