Unverified Commit e04603f8 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10787 NFSD: Fix the behavior of READ near OFFSET_MAX 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Lingfeng <lilingfeng3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/SN5ZB5G2VN4H46KQSDNWR7DAEFOTJAXP/ 
 
https://gitee.com/src-openeuler/kernel/issues/IADG80 
 
Link:https://gitee.com/openeuler/kernel/pulls/10787

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents ec0e9a4b 68f74c34

fs/nfsd/nfs3proc.c

+6 −2
Original line number Diff line number Diff line
@@ -145,18 +145,22 @@ nfsd3_proc_read(struct svc_rqst *rqstp) 
	struct nfsd3_readargs *argp = rqstp->rq_argp;

	struct nfsd3_readres *resp = rqstp->rq_resp;

	u32	max_blocksize = svc_max_payload(rqstp);

	unsigned long cnt = min(argp->count, max_blocksize);



	dprintk("nfsd: READ(3) %s %lu bytes at %Lu\n",

				SVCFH_fmt(&argp->fh),

				(unsigned long) argp->count,

				(unsigned long long) argp->offset);



	argp->count = min_t(u32, argp->count, max_blocksize);

	if (argp->offset > (u64)OFFSET_MAX)

		argp->offset = (u64)OFFSET_MAX;

	if (argp->offset + argp->count > (u64)OFFSET_MAX)

		argp->count = (u64)OFFSET_MAX - argp->offset;

	/* Obtain buffer pointer for payload.

	 * 1 (status) + 22 (post_op_attr) + 1 (count) + 1 (eof)

	 * + 1 (xdr opaque byte count) = 26

	 */

	resp->count = cnt;

	resp->count = argp->count;

	svc_reserve_auth(rqstp, ((1 + NFS3_POST_OP_ATTR_WORDS + 3)<<2) + resp->count +4);



	fh_copy(&resp->fh, &argp->fh);

fs/nfsd/nfs4proc.c

+6 −2
Original line number Diff line number Diff line
@@ -772,12 +772,16 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	__be32 status;



	read->rd_nf = NULL;

	if (read->rd_offset >= OFFSET_MAX)

		return nfserr_inval;



	trace_nfsd_read_start(rqstp, &cstate->current_fh,

			      read->rd_offset, read->rd_length);



	read->rd_length = min_t(u32, read->rd_length, svc_max_payload(rqstp));

	if (read->rd_offset > (u64)OFFSET_MAX)

		read->rd_offset = (u64)OFFSET_MAX;

	if (read->rd_offset + read->rd_length > (u64)OFFSET_MAX)

		read->rd_length = (u64)OFFSET_MAX - read->rd_offset;



	/*

	 * If we do a zero copy read, then a client will see read data

	 * that reflects the state of the file *after* performing the

fs/nfsd/nfs4xdr.c

+2 −6
Original line number Diff line number Diff line
@@ -3886,10 +3886,8 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr, 
	}

	xdr_commit_encode(xdr);



	maxcount = svc_max_payload(resp->rqstp);

	maxcount = min_t(unsigned long, maxcount,

	maxcount = min_t(unsigned long, read->rd_length,

			 (xdr->buf->buflen - xdr->buf->len));

	maxcount = min_t(unsigned long, maxcount, read->rd_length);



	if (file->f_op->splice_read &&

	    test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags))
@@ -4714,10 +4712,8 @@ nfsd4_encode_read_plus(struct nfsd4_compoundres *resp, __be32 nfserr, 
		return nfserr_resource;

	xdr_commit_encode(xdr);



	maxcount = svc_max_payload(resp->rqstp);

	maxcount = min_t(unsigned long, maxcount,

	maxcount = min_t(unsigned long, read->rd_length,

			 (xdr->buf->buflen - xdr->buf->len));

	maxcount = min_t(unsigned long, maxcount, read->rd_length);

	count    = maxcount;



	eof = read->rd_offset >= i_size_read(file_inode(file));