upstream: switch config file parsing to getline(3) as this avoids

static limits noted by gerhard@; ok dtucker@, djm@

OpenBSD-Commit-ID: 6d702eabef0fa12e5a1d75c334a8c8b325298b5c

1 files changed, 9 insertions, 6 deletions

diff --git a/hostfile.c b/hostfile.c
index 12f174ff9..e08339379 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostfile.c,v 1.71 2017/05/31 09:15:42 deraadt Exp $ */
+/* $OpenBSD: hostfile.c,v 1.72 2018/06/06 18:29:18 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -663,14 +663,14 @@ hostkeys_foreach(const char *path, hostkeys_foreach_fn *callback, void *ctx,
     const char *host, const char *ip, u_int options)
 {
         FILE *f;
-        char line[8192], oline[8192], ktype[128];
+        char *line = NULL, ktype[128];
         u_long linenum = 0;
         char *cp, *cp2;
         u_int kbits;
         int hashed;
         int s, r = 0;
         struct hostkey_foreach_line lineinfo;
-        size_t l;
+        size_t linesize = 0, l;
 
         memset(&lineinfo, 0, sizeof(lineinfo));
         if (host == NULL && (options & HKF_WANT_MATCH) != 0)
@@ -679,15 +679,16 @@ hostkeys_foreach(const char *path, hostkeys_foreach_fn *callback, void *ctx,
                 return SSH_ERR_SYSTEM_ERROR;
 
         debug3("%s: reading file \"%s\"", __func__, path);
-        while (read_keyfile_line(f, path, line, sizeof(line), &linenum) == 0) {
+        while (getline(&line, &linesize, f) != -1) {
+                linenum++;
                 line[strcspn(line, "\n")] = '\0';
-                strlcpy(oline, line, sizeof(oline));
 
                 sshkey_free(lineinfo.key);
                 memset(&lineinfo, 0, sizeof(lineinfo));
                 lineinfo.path = path;
                 lineinfo.linenum = linenum;
-                lineinfo.line = oline;
+                free(lineinfo.line);
+                lineinfo.line = xstrdup(line);
                 lineinfo.marker = MRK_NONE;
                 lineinfo.status = HKF_STATUS_OK;
                 lineinfo.keytype = KEY_UNSPEC;
@@ -826,6 +827,8 @@ hostkeys_foreach(const char *path, hostkeys_foreach_fn *callback, void *ctx,
                         break;
         }
         sshkey_free(lineinfo.key);
+        free(lineinfo.line);
+        free(line);
         fclose(f);
         return r;
 }