diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-14 17:22:18 -0400 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-07-04 12:11:26 +0200 |
| commit | 84b4dddacaa3fd98b3c3e3895d23d34f45a6239f (patch) | |
| tree | 504ed6b6618a2f26e00f5782d971a1c6f296497b | |
| parent | e60a44aab07cb9b015d6fbfdef58a773595da60a (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: Willy Tarreau <w@1wt.eu>
| -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 853d62327..e191aab9e 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -2080,6 +2080,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); |