diff options
author | J. Bruce Fields <bfields@redhat.com> | 2018-11-26 11:36:52 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2018-11-27 16:24:01 -0500 |
commit | b8db159239b3f51e2b909859935cc25cb3ff3eed (patch) | |
tree | afa91aa9e59d697f6129c45c2a0b0372fcb3911d /fs/lockd/clntxdr.c | |
parent | 0d4d6720ce9ac0d393aa35696520fde48b2064a5 (diff) | |
download | linux-stable-b8db159239b3f51e2b909859935cc25cb3ff3eed.tar.gz linux-stable-b8db159239b3f51e2b909859935cc25cb3ff3eed.tar.bz2 linux-stable-b8db159239b3f51e2b909859935cc25cb3ff3eed.zip |
lockd: fix decoding of TEST results
We fail to advance the read pointer when reading the stat.oh field that
identifies the lock-holder in a TEST result.
This turns out not to matter if the server is knfsd, which always
returns a zero-length field. But other servers (Ganesha is an example)
may not do this. The result is bad values in fcntl F_GETLK results.
Fix this.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/lockd/clntxdr.c')
-rw-r--r-- | fs/lockd/clntxdr.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/fs/lockd/clntxdr.c b/fs/lockd/clntxdr.c index 2c6176387143..747b9c8c940a 100644 --- a/fs/lockd/clntxdr.c +++ b/fs/lockd/clntxdr.c @@ -125,24 +125,14 @@ static void encode_netobj(struct xdr_stream *xdr, static int decode_netobj(struct xdr_stream *xdr, struct xdr_netobj *obj) { - u32 length; - __be32 *p; + ssize_t ret; - p = xdr_inline_decode(xdr, 4); - if (unlikely(p == NULL)) - goto out_overflow; - length = be32_to_cpup(p++); - if (unlikely(length > XDR_MAX_NETOBJ)) - goto out_size; - obj->len = length; - obj->data = (u8 *)p; + ret = xdr_stream_decode_opaque_inline(xdr, (void *)&obj->data, + XDR_MAX_NETOBJ); + if (unlikely(ret < 0)) + return -EIO; + obj->len = ret; return 0; -out_size: - dprintk("NFS: returned netobj was too long: %u\n", length); - return -EIO; -out_overflow: - print_overflow_msg(__func__, xdr); - return -EIO; } /* |