[openssh-commits] [openssh] 01/03: upstream: Check for and disallow MaxStartups values less than or

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 1d78d25653805aefc7a8dd9d86cd7359ada3823c
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Mon Nov 7 10:02:59 2022 +0000

    upstream: Check for and disallow MaxStartups values less than or
    
    equal to zero during config parsing, rather than faling later at runtime.
    bz#3489, ok djm@
    
    OpenBSD-Commit-ID: d79c2b7a8601eb9be493629a91245d761154308b
---
 servconf.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/servconf.c b/servconf.c
index 423772b1..bba3ad80 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
 
-/* $OpenBSD: servconf.c,v 1.386 2022/09/17 10:34:29 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.387 2022/11/07 10:02:59 dtucker Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1918,6 +1918,10 @@ process_server_config_line_depth(ServerOptions *options, char *line,
 			    filename, linenum, keyword);
 		else
 			options->max_startups = options->max_startups_begin;
+		if (options->max_startups <= 0 ||
+		    options->max_startups_begin <= 0)
+			fatal("%s line %d: Invalid %s spec.",
+			    filename, linenum, keyword);
 		break;
 
 	case sPerSourceNetBlockSize:

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.