summaryrefslogtreecommitdiff
path: root/net/9p
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-04-14 17:22:18 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2017-04-17 14:23:20 -0400
commit71d6ad08379304128e4bdfaf0b4185d54375423e (patch)
treedf6bc8ac4a4a30e38bfdf797a59482c03f4b9c1a /net/9p
parent890559e34eac1fb90a4b5916d4a1387376a05d51 (diff)
p9_client_readdir() fix
Don't assume that server is sane and won't return more data than asked for. Cc: stable@vger.kernel.org Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/9p')
-rw-r--r--net/9p/client.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/9p/client.c b/net/9p/client.c
index 3ce672af1596..8e5c6a8d0a37 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -2101,6 +2101,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);