diff options
| author | jsg@openbsd.org <jsg@openbsd.org> | 2014-11-24 04:39:22 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-11-26 03:37:41 +0100 |
| commit | 72bba3d179ced8b425272efe6956a309202a91f3 (patch) | |
| tree | 047d271feb9f26003cfb1546cf31849486a84d5d /servconf.c | |
| parent | Avoid Cygwin ssh-host-config reading /etc/group (diff) | |
| download | openssh-72bba3d179ced8b425272efe6956a309202a91f3.tar.xz openssh-72bba3d179ced8b425272efe6956a309202a91f3.zip | |
upstream commit
Fix crashes in the handling of the sshd config file found
with the afl fuzzer.
ok deraadt@ djm@
Diffstat (limited to 'servconf.c')
| -rw-r--r-- | servconf.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/servconf.c b/servconf.c index b317e9c30..99396fb1d 100644 --- a/servconf.c +++ b/servconf.c @@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.254 2014/10/24 02:01:20 lteo Exp $ */ +/* $OpenBSD: servconf.c,v 1.255 2014/11/24 03:39:22 jsg Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -1612,6 +1612,9 @@ process_server_config_line(ServerOptions *options, char *line, return 0; case sAuthorizedKeysCommand: + if (cp == NULL) + fatal("%.200s line %d: Missing argument.", filename, + linenum); len = strspn(cp, WHITESPACE); if (*activep && options->authorized_keys_command == NULL) { if (cp[len] != '/' && strcasecmp(cp + len, "none") != 0) @@ -1626,6 +1629,9 @@ process_server_config_line(ServerOptions *options, char *line, charptr = &options->authorized_keys_command_user; arg = strdelim(&cp); + if (!arg || *arg == '\0') + fatal("%s line %d: missing AuthorizedKeysCommandUser " + "argument.", filename, linenum); if (*activep && *charptr == NULL) *charptr = xstrdup(arg); break; |