From dac3b1059b499c570f02cd94f3172d8c8df3a9dd Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Tue, 8 Dec 2020 08:41:01 -0500 Subject: NFSv4.2: Handle hole lengths that exceed the READ_PLUS read buffer If a hole extends beyond the READ_PLUS read buffer, then we want to fill just the remaining buffer with zeros. Also ignore eof... Signed-off-by: Trond Myklebust --- fs/nfs/nfs42xdr.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'fs/nfs/nfs42xdr.c') diff --git a/fs/nfs/nfs42xdr.c b/fs/nfs/nfs42xdr.c index f9faa131a4f5..6ba2a28e7e03 100644 --- a/fs/nfs/nfs42xdr.c +++ b/fs/nfs/nfs42xdr.c @@ -1080,6 +1080,12 @@ static int decode_read_plus_hole(struct xdr_stream *xdr, } length -= args->offset + res->count - offset; } + if (length + res->count > args->count) { + *eof = 0; + if (unlikely(res->count >= args->count)) + return 1; + length = args->count - res->count; + } recvd = xdr_expand_hole(xdr, res->count, length); res->count += recvd; -- cgit v1.2.3