From: markus@openbsd.org <markus@openbsd.org>
Date: Wed, 24 Jun 2020 15:08:53 +0000 (+0000)
Subject: upstream: allow sshd_config longer than 256k; ok djm
X-Git-Tag: V_8_4_P1~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89b54900ac61986760452f132bbe3fb7249cfdac;p=thirdparty%2Fopenssh-portable.git

upstream: allow sshd_config longer than 256k; ok djm

OpenBSD-Commit-ID: 83f40dd5457a64c1d3928eb4364461b22766beb3
---

diff --git a/msg.c b/msg.c
index 99c25cd25..574a566e3 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);
 	}