Skip to content

Commit 66fc3f0

Browse files
pvts-matPlaidCat
authored andcommitted
nfsd: fix heap overflow in NFSv4.0 LOCK replay cache
jira VULN-180160 cve CVE-2026-31402 commit-author Jeff Layton <jlayton@kernel.org> commit 5133b61 upstream-diff Used `post_err_offset' instead of `op_status_offset + XDR_UNIT' in the `read_bytes_from_xdr_buf()' call, as the CBR 7.9 version is missing ef3675b ("NFSD: Encode COMPOUND operation status on page boundaries") The NFSv4.0 replay cache uses a fixed 112-byte inline buffer (rp_ibuf[NFSD4_REPLAY_ISIZE]) to store encoded operation responses. This size was calculated based on OPEN responses and does not account for LOCK denied responses, which include the conflicting lock owner as a variable-length field up to 1024 bytes (NFS4_OPAQUE_LIMIT). When a LOCK operation is denied due to a conflict with an existing lock that has a large owner, nfsd4_encode_operation() copies the full encoded response into the undersized replay buffer via read_bytes_from_xdr_buf() with no bounds check. This results in a slab-out-of-bounds write of up to 944 bytes past the end of the buffer, corrupting adjacent heap memory. This can be triggered remotely by an unauthenticated attacker with two cooperating NFSv4.0 clients: one sets a lock with a large owner string, then the other requests a conflicting lock to provoke the denial. We could fix this by increasing NFSD4_REPLAY_ISIZE to allow for a full opaque, but that would increase the size of every stateowner, when most lockowners are not that large. Instead, fix this by checking the encoded response length against NFSD4_REPLAY_ISIZE before copying into the replay buffer. If the response is too large, set rp_buflen to 0 to skip caching the replay payload. The status is still cached, and the client already received the correct response on the original request. Fixes: 1da177e ("Linux-2.6.12-rc2") Cc: stable@kernel.org Reported-by: Nicholas Carlini <npc@anthropic.com> Tested-by: Nicholas Carlini <npc@anthropic.com> Signed-off-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> (cherry picked from commit 5133b61) Signed-off-by: Marcin Wcisło <marcin.wcislo@conclusive.pl>
1 parent 1f6b945 commit 66fc3f0

2 files changed

Lines changed: 19 additions & 7 deletions

File tree

fs/nfsd/nfs4xdr.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4469,9 +4469,14 @@ nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op)
44694469
int len = xdr->buf->len - post_err_offset;
44704470

44714471
so->so_replay.rp_status = op->status;
4472-
so->so_replay.rp_buflen = len;
4473-
read_bytes_from_xdr_buf(xdr->buf, post_err_offset,
4472+
if (len <= NFSD4_REPLAY_ISIZE) {
4473+
so->so_replay.rp_buflen = len;
4474+
read_bytes_from_xdr_buf(xdr->buf,
4475+
post_err_offset,
44744476
so->so_replay.rp_buf, len);
4477+
} else {
4478+
so->so_replay.rp_buflen = 0;
4479+
}
44754480
}
44764481
status:
44774482
/* Note that op->status is already in network byte order: */

fs/nfsd/state.h

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -364,11 +364,18 @@ struct nfs4_client_reclaim {
364364
char cr_recdir[HEXDIR_LEN]; /* recover dir */
365365
};
366366

367-
/* A reasonable value for REPLAY_ISIZE was estimated as follows:
368-
* The OPEN response, typically the largest, requires
369-
* 4(status) + 8(stateid) + 20(changeinfo) + 4(rflags) + 8(verifier) +
370-
* 4(deleg. type) + 8(deleg. stateid) + 4(deleg. recall flag) +
371-
* 20(deleg. space limit) + ~32(deleg. ace) = 112 bytes
367+
/*
368+
* REPLAY_ISIZE is sized for an OPEN response with delegation:
369+
* 4(status) + 8(stateid) + 20(changeinfo) + 4(rflags) +
370+
* 8(verifier) + 4(deleg. type) + 8(deleg. stateid) +
371+
* 4(deleg. recall flag) + 20(deleg. space limit) +
372+
* ~32(deleg. ace) = 112 bytes
373+
*
374+
* Some responses can exceed this. A LOCK denial includes the conflicting
375+
* lock owner, which can be up to 1024 bytes (NFS4_OPAQUE_LIMIT). Responses
376+
* larger than REPLAY_ISIZE are not cached in rp_ibuf; only rp_status is
377+
* saved. Enlarging this constant increases the size of every
378+
* nfs4_stateowner.
372379
*/
373380

374381
#define NFSD4_REPLAY_ISIZE 112

0 commit comments

Comments
 (0)