summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2020-06-24 15:08:54 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2020-06-24 15:08:54 +0000
commit28ae883cef3043b7035735c6663a561e327792c2 (patch)
tree2aa55b451f67edd10a3c4d6efc7fc0d18482e129 /usr.bin
parent7510911020fa28c04ca5233d0af3bebc1e6ac974 (diff)
allow sshd_config longer than 256k; ok djm
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/msg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/msg.c b/usr.bin/ssh/msg.c
index cda3f19b5ee..144b0da1b1f 100644
--- a/usr.bin/ssh/msg.c
+++ b/usr.bin/ssh/msg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msg.c,v 1.18 2020/01/22 04:49:16 djm Exp $ */
+/* $OpenBSD: msg.c,v 1.19 2020/06/24 15:08:53 markus Exp $ */
/*
* Copyright (c) 2002 Markus Friedl. All rights reserved.
*
@@ -75,7 +75,7 @@ ssh_msg_recv(int fd, struct sshbuf *m)
return (-1);
}
msg_len = get_u32(buf);
- if (msg_len > 256 * 1024) {
+ if (msg_len > sshbuf_max_size(m)) {
error("%s: read: bad msg_len %u", __func__, msg_len);
return (-1);
}