Skip to content

Commit 640f87c

Browse files
committed
NFSD: Protect against send buffer overflow in NFSv3 READDIR
Since before the git era, NFSD has conserved the number of pages held by each nfsd thread by combining the RPC receive and send buffers into a single array of pages. This works because there are no cases where an operation needs a large RPC Call message and a large RPC Reply message at the same time. Once an RPC Call has been received, svc_process() updates svc_rqst::rq_res to describe the part of rq_pages that can be used for constructing the Reply. This means that the send buffer (rq_res) shrinks when the received RPC record containing the RPC Call is large. A client can force this shrinkage on TCP by sending a correctly- formed RPC Call header contained in an RPC record that is excessively large. The full maximum payload size cannot be constructed in that case. Thanks to Aleksi Illikainen and Kari Hulkko for uncovering this issue. Reported-by: Ben Ronallo <Benjamin.Ronallo@synopsys.com> Cc: <stable@vger.kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent 00b4492 commit 640f87c

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

fs/nfsd/nfs3proc.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -563,13 +563,14 @@ static void nfsd3_init_dirlist_pages(struct svc_rqst *rqstp,
563563
{
564564
struct xdr_buf *buf = &resp->dirlist;
565565
struct xdr_stream *xdr = &resp->xdr;
566-
567-
count = clamp(count, (u32)(XDR_UNIT * 2), svc_max_payload(rqstp));
566+
unsigned int sendbuf = min_t(unsigned int, rqstp->rq_res.buflen,
567+
svc_max_payload(rqstp));
568568

569569
memset(buf, 0, sizeof(*buf));
570570

571571
/* Reserve room for the NULL ptr & eof flag (-2 words) */
572-
buf->buflen = count - XDR_UNIT * 2;
572+
buf->buflen = clamp(count, (u32)(XDR_UNIT * 2), sendbuf);
573+
buf->buflen -= XDR_UNIT * 2;
573574
buf->pages = rqstp->rq_next_page;
574575
rqstp->rq_next_page += (buf->buflen + PAGE_SIZE - 1) >> PAGE_SHIFT;
575576

0 commit comments

Comments
 (0)