summaryrefslogtreecommitdiffstats
path: root/net/9p
diff options
context:
space:
mode:
authorGertjan Halkes <gertjan@google.com>2018-09-05 15:41:29 +0900
committerDominique Martinet <dominique.martinet@cea.fr>2018-09-08 01:40:06 +0900
commit2803cf4379ed252894f046cb8812a48db35294e3 (patch)
tree917406ef3dcc19aefb044f3ddd945107e128644f /net/9p
parent6d35190f395316916c8bb4aabd35a182890bf856 (diff)
downloadlinux-2803cf4379ed252894f046cb8812a48db35294e3.tar.bz2
9p: do not trust pdu content for stat item size
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>
Diffstat (limited to 'net/9p')
-rw-r--r--net/9p/protocol.c3
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);