diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-14 17:22:18 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-08 07:44:09 +0200 |
| commit | 1c755e1f3dbad72245ef5c46c21fca04f3e93d9e (patch) | |
| tree | d26460d7fc6505a954d6383d0e047962c4f639a4 /net | |
| parent | 91f5719c8ac7458641efa3f49ede436e7d6bd6de (diff) | |
p9_client_readdir() fix
commit 71d6ad08379304128e4bdfaf0b4185d54375423e upstream.
Don't assume that server is sane and won't return more data than
asked for.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/9p/client.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/9p/client.c b/net/9p/client.c index 53fe98ee8a55..d43baabfb02d 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -2106,6 +2106,10 @@ int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset) trace_9p_protocol_dump(clnt, req->rc); goto free_and_error; } + if (rsize < count) { + pr_err("bogus RREADDIR count (%d > %d)\n", count, rsize); + count = rsize; + } p9_debug(P9_DEBUG_9P, "<<< RREADDIR count %d\n", count); |