diff options
| author |   dtucker <dtucker@openbsd.org> | 2019-01-24 02:34:52 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2019-01-24 02:34:52 +0000 |
| commit | cff495a7943481a583352354b09d809cf7f57123 (patch) | |
| tree | 8ea2e2f1b24cb5700188b178848f60f7a3f989ed | |
| parent | move the extensions_seen into the handshake struct (diff) | |
| download | wireguard-openbsd-cff495a7943481a583352354b09d809cf7f57123.tar.xz wireguard-openbsd-cff495a7943481a583352354b09d809cf7f57123.zip | |
Always initialize 2nd arg to hpdelim2. It populates that *ONLY IF*
there's a delimiter. If there's not (the common case) it checked
uninitialized memory, which usually passed, but if not would cause
spurious failures when the uninitialized memory happens to contain
"/". ok deraadt.
| -rw-r--r-- | usr.bin/ssh/servconf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index 4114767d323..b56f0a07304 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/servconf.c @@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.347 2019/01/23 21:50:56 dtucker Exp $ */ +/* $OpenBSD: servconf.c,v 1.348 2019/01/24 02:34:52 dtucker Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -839,6 +839,7 @@ process_permitopen_list(struct ssh *ssh, ServerOpCodes opcode, /* Otherwise treat it as a list of permitted host:port */ for (i = 0; i < num_opens; i++) { oarg = arg = xstrdup(opens[i]); + ch = '\0'; host = hpdelim2(&arg, &ch); if (host == NULL || ch == '/') fatal("%s: missing host in %s", __func__, what); @@ -1157,7 +1158,7 @@ process_server_config_line(ServerOptions *options, char *line, const char *filename, int linenum, int *activep, struct connection_info *connectinfo) { - char *cp, ***chararrayptr, **charptr, *arg, *arg2, *p; + char ch, *cp, ***chararrayptr, **charptr, *arg, *arg2, *p; int cmdline = 0, *intptr, value, value2, n, port; SyslogFacility *log_facility_ptr; LogLevel *log_level_ptr; @@ -1251,8 +1252,8 @@ process_server_config_line(ServerOptions *options, char *line, port = 0; p = arg; } else { - char ch; arg2 = NULL; + ch = '\0'; p = hpdelim2(&arg, &ch); if (p == NULL || ch == '/') fatal("%s line %d: bad address:port usage", @@ -1881,9 +1882,8 @@ process_server_config_line(ServerOptions *options, char *line, */ xasprintf(&arg2, "*:%s", arg); } else { - char ch; - arg2 = xstrdup(arg); + ch = '\0'; p = hpdelim2(&arg, &ch); if (p == NULL || ch == '/') { fatal("%s line %d: missing host in %s", |