Skip to content

Commit

Permalink
nfsd4: fix oops on unusual readlike compound
Browse files Browse the repository at this point in the history
If the argument and reply together exceed the maximum payload size, then
a reply with a read-like operation can overlow the rq_pages array.

Cc: stable@kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
  • Loading branch information
J. Bruce Fields committed Dec 18, 2012
1 parent 9b3234b commit d5f50b0
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion fs/nfsd/nfs4xdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -2925,11 +2925,16 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr,
len = maxcount;
v = 0;
while (len > 0) {
pn = resp->rqstp->rq_resused++;
pn = resp->rqstp->rq_resused;
if (!resp->rqstp->rq_respages[pn]) { /* ran out of pages */
maxcount -= len;
break;
}
resp->rqstp->rq_vec[v].iov_base =
page_address(resp->rqstp->rq_respages[pn]);
resp->rqstp->rq_vec[v].iov_len =
len < PAGE_SIZE ? len : PAGE_SIZE;
resp->rqstp->rq_resused++;
v++;
len -= PAGE_SIZE;
}
Expand Down Expand Up @@ -2975,6 +2980,8 @@ nfsd4_encode_readlink(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd
return nfserr;
if (resp->xbuf->page_len)
return nfserr_resource;
if (!resp->rqstp->rq_respages[resp->rqstp->rq_resused])
return nfserr_resource;

page = page_address(resp->rqstp->rq_respages[resp->rqstp->rq_resused++]);

Expand Down Expand Up @@ -3024,6 +3031,8 @@ nfsd4_encode_readdir(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4
return nfserr;
if (resp->xbuf->page_len)
return nfserr_resource;
if (!resp->rqstp->rq_respages[resp->rqstp->rq_resused])
return nfserr_resource;

RESERVE_SPACE(NFS4_VERIFIER_SIZE);
savep = p;
Expand Down

0 comments on commit d5f50b0

Please sign in to comment.