summaryrefslogtreecommitdiff
path: root/msg.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2020-06-24 15:08:53 +0000
committerDamien Miller <djm@mindrot.org>2020-06-26 15:18:07 +1000
commit89b54900ac61986760452f132bbe3fb7249cfdac (patch)
tree06c27bd5e77bc26d0502864a03101f67b4c25e30 /msg.c
parente3fa6249e6d9ceb57c14b04dd4c0cfab12fa7cd5 (diff)
downloadopenssh-git-89b54900ac61986760452f132bbe3fb7249cfdac.tar.gz
upstream: allow sshd_config longer than 256k; ok djm
OpenBSD-Commit-ID: 83f40dd5457a64c1d3928eb4364461b22766beb3
Diffstat (limited to 'msg.c')
-rw-r--r--msg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/msg.c b/msg.c
index 99c25cd2..574a566e 100644
--- a/msg.c
+++ b/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.
*
@@ -77,7 +77,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);
}