| From | Jiri Slaby <> | Subject | [PATCH 3.12 83/86] p9_client_readdir() fix | Date | Thu, 4 May 2017 11:04:48 +0200 |
| |
From: Al Viro <viro@zeniv.linux.org.uk>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
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: Jiri Slaby <jslaby@suse.cz> --- net/9p/client.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/net/9p/client.c b/net/9p/client.c index ae4778c84559..bde453ae5e2e 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -2099,6 +2099,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); -- 2.12.2
|