diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-14 17:22:18 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2017-05-09 08:19:54 +0200 |
| commit | a8ece68c56153be505ef9b3ef55e4bcd3cef9331 (patch) | |
| tree | e624ca6f86d091b815ca6527ce4abc1d0879486b | |
| parent | eff3cc735c263d86c83045eef67590770d248c37 (diff) | |
| download | linux-rt-a8ece68c56153be505ef9b3ef55e4bcd3cef9331.tar.gz | |
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: Jiri Slaby <jslaby@suse.cz>
| -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 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); |