From 59071bc4c516e462af4f5698062022bb9e1b0471 Mon Sep 17 00:00:00 2001 From: Tilo Eckert Date: Fri, 12 Oct 2018 15:15:00 +0200 Subject: [PATCH] knownhosts: Fix invalid read of known_hosts token Fixes invalid read introduced by commit 21962d. Accessing tokens[4] for a known_hosts line of three tokens led to randomly rejected host keys. This commit completely removes the check because the optional comments field may contain whitespace. Signed-off-by: Tilo Eckert (cherry picked from commit 45058285fca549876449afef2c32833b24817e77) --- src/known_hosts.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/known_hosts.c b/src/known_hosts.c index f52f74b3..407e1de5 100644 --- a/src/known_hosts.c +++ b/src/known_hosts.c @@ -131,17 +131,13 @@ static char **ssh_get_knownhost_line(FILE **file, const char *filename, return NULL; } - if(!tokens[0] || !tokens[1] || !tokens[2]) { + if(tokens[0] == NULL || tokens[1] == NULL || tokens[2] == NULL) { /* it should have at least 3 tokens */ tokens_free(tokens); continue; } *found_type = tokens[1]; - if (tokens[3] || tokens[4]) { - tokens_free(tokens); - continue; - } return tokens; }