summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2017-08-10 06:59:43 +0000
committerdelphij <delphij@FreeBSD.org>2017-08-10 06:59:43 +0000
commit4f0def8d48a1ccf838d52033ac2ddb87600faaaf (patch)
tree9e70c8027bce9c432770b6c412b82bca6a293dd2 /crypto
parentdc92a5e2298774036551d0b9cdfb9a8814a6414b (diff)
downloadFreeBSD-src-releng/10.3.zip
FreeBSD-src-releng/10.3.tar.gz
Fix OpenSSH Denial of Service vulnerability. [SA-17:06]releng/10.3
Approved by: so
Diffstat (limited to 'crypto')
-rw-r--r--crypto/openssh/auth-passwd.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/crypto/openssh/auth-passwd.c b/crypto/openssh/auth-passwd.c
index 63ccf3c..f6825ec 100644
--- a/crypto/openssh/auth-passwd.c
+++ b/crypto/openssh/auth-passwd.c
@@ -66,6 +66,8 @@ extern login_cap_t *lc;
#define DAY (24L * 60 * 60) /* 1 day in seconds */
#define TWO_WEEKS (2L * 7 * DAY) /* 2 weeks in seconds */
+#define MAX_PASSWORD_LEN 1024
+
void
disable_forwarding(void)
{
@@ -87,6 +89,9 @@ auth_password(Authctxt *authctxt, const char *password)
static int expire_checked = 0;
#endif
+ if (strlen(password) > MAX_PASSWORD_LEN)
+ return 0;
+
#ifndef HAVE_CYGWIN
if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
ok = 0;
OpenPOWER on IntegriCloud