diff options
| author | Gertjan Halkes | 2018-09-05 08:41:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-04-20 09:16:00 +0200 |
| commit | db77c7890ed73cfbdeb65954f12f6e0dab51b823 (patch) | |
| tree | c6b3d1522a1251f19946ce7958740d11155414fa /net/9p | |
| parent | f2fs: fix to avoid NULL pointer dereference on se->discard_map (diff) | |
| download | kernel-qcow2-linux-db77c7890ed73cfbdeb65954f12f6e0dab51b823.tar.gz kernel-qcow2-linux-db77c7890ed73cfbdeb65954f12f6e0dab51b823.tar.xz kernel-qcow2-linux-db77c7890ed73cfbdeb65954f12f6e0dab51b823.zip | |
9p: do not trust pdu content for stat item size
[ Upstream commit 2803cf4379ed252894f046cb8812a48db35294e3 ]
v9fs_dir_readdir() could deadloop if a struct was sent with a size set
to -2
Link: http://lkml.kernel.org/r/1536134432-11997-1-git-send-email-asmadeus@codewreck.org
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=88021
Signed-off-by: Gertjan Halkes <gertjan@google.com>
Signed-off-by: Dominique Martinet <dominique.martinet@cea.fr>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/9p')
| -rw-r--r-- | net/9p/protocol.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/9p/protocol.c b/net/9p/protocol.c index ee32bbf12675..b4d80c533f89 100644 --- a/net/9p/protocol.c +++ b/net/9p/protocol.c @@ -571,9 +571,10 @@ int p9stat_read(struct p9_client *clnt, char *buf, int len, struct p9_wstat *st) if (ret) { p9_debug(P9_DEBUG_9P, "<<< p9stat_read failed: %d\n", ret); trace_9p_protocol_dump(clnt, &fake_pdu); + return ret; } - return ret; + return fake_pdu.offset; } EXPORT_SYMBOL(p9stat_read); |