summaryrefslogtreecommitdiff
path: root/auth-options.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-07-09 04:15:00 +0000
committerDamien Miller <djm@mindrot.org>2019-07-09 14:20:15 +1000
commit5b2b79ff7c057ee101518545727ed3023372891d (patch)
tree73b104b883b87dbd00954199a16c1238d2a71299 /auth-options.c
parenteb0b51dac408fadd1fd13fa6d726ab8fdfcc4152 (diff)
upstream: cap the number of permiopen/permitlisten directives we're
willing to parse on a single authorized_keys line; ok deraadt@ OpenBSD-Commit-ID: a43a752c2555d26aa3fc754805a476f6e3e30f46
Diffstat (limited to 'auth-options.c')
-rw-r--r--auth-options.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/auth-options.c b/auth-options.c
index 4923a83b7..514221882 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-options.c,v 1.85 2019/06/27 18:03:37 deraadt Exp $ */ 1/* $OpenBSD: auth-options.c,v 1.86 2019/07/09 04:15:00 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2018 Damien Miller <djm@mindrot.org> 3 * Copyright (c) 2018 Damien Miller <djm@mindrot.org>
4 * 4 *
@@ -320,7 +320,7 @@ handle_permit(const char **optsp, int allow_bare_port,
320 size_t npermits = *npermitsp; 320 size_t npermits = *npermitsp;
321 const char *errstr = "unknown error"; 321 const char *errstr = "unknown error";
322 322
323 if (npermits > INT_MAX) { 323 if (npermits > SSH_AUTHOPT_PERMIT_MAX) {
324 *errstrp = "too many permission directives"; 324 *errstrp = "too many permission directives";
325 return -1; 325 return -1;
326 } 326 }