Skip to content

Commit 7e66e0e

Browse files
jtlaytonopsiff
authored andcommitted
nfsd: fix heap overflow in NFSv4.0 LOCK replay cache
[ Upstream commit 5133b61aaf437e5f25b1b396b14242a6bb0508e2 ] 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> [ replaced `op_status_offset + XDR_UNIT` with existing `post_err_offset` variable ] Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 8afb437ea1f70cacb4bbdf11771fb5c4d720b965) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent a7a57bb commit 7e66e0e

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
@@ -5425,9 +5425,14 @@ nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op)
54255425
int len = xdr->buf->len - post_err_offset;
54265426

54275427
so->so_replay.rp_status = op->status;
5428-
so->so_replay.rp_buflen = len;
5429-
read_bytes_from_xdr_buf(xdr->buf, post_err_offset,
5428+
if (len <= NFSD4_REPLAY_ISIZE) {
5429+
so->so_replay.rp_buflen = len;
5430+
read_bytes_from_xdr_buf(xdr->buf,
5431+
post_err_offset,
54305432
so->so_replay.rp_buf, len);
5433+
} else {
5434+
so->so_replay.rp_buflen = 0;
5435+
}
54315436
}
54325437
status:
54335438
*p = op->status;

fs/nfsd/state.h

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -430,11 +430,18 @@ struct nfs4_client_reclaim {
430430
struct xdr_netobj cr_princhash;
431431
};
432432

433-
/* A reasonable value for REPLAY_ISIZE was estimated as follows:
434-
* The OPEN response, typically the largest, requires
435-
* 4(status) + 8(stateid) + 20(changeinfo) + 4(rflags) + 8(verifier) +
436-
* 4(deleg. type) + 8(deleg. stateid) + 4(deleg. recall flag) +
437-
* 20(deleg. space limit) + ~32(deleg. ace) = 112 bytes
433+
/*
434+
* REPLAY_ISIZE is sized for an OPEN response with delegation:
435+
* 4(status) + 8(stateid) + 20(changeinfo) + 4(rflags) +
436+
* 8(verifier) + 4(deleg. type) + 8(deleg. stateid) +
437+
* 4(deleg. recall flag) + 20(deleg. space limit) +
438+
* ~32(deleg. ace) = 112 bytes
439+
*
440+
* Some responses can exceed this. A LOCK denial includes the conflicting
441+
* lock owner, which can be up to 1024 bytes (NFS4_OPAQUE_LIMIT). Responses
442+
* larger than REPLAY_ISIZE are not cached in rp_ibuf; only rp_status is
443+
* saved. Enlarging this constant increases the size of every
444+
* nfs4_stateowner.
438445
*/
439446

440447
#define NFSD4_REPLAY_ISIZE 112

0 commit comments

Comments
 (0)