shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 09:54:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

knownhosts: Fix invalid read of known_hosts token

Browse Source 
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 <tilo.eckert@flam.de>
This commit is contained in:
Tilo Eckert
2018-10-12 15:15:00 +02:00
committed by Andreas Schneider
parent 42bd7cdf6c
commit 45058285fc
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/known_hosts.c
View File

@@ -131,17 +131,13 @@ static char **ssh_get_knownhost_line(FILE **file, const char *filename,
return NULL; 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 */ /* it should have at least 3 tokens */
tokens_free(tokens); tokens_free(tokens);
continue; continue;
} }
*found_type = tokens[1]; *found_type = tokens[1];
if (tokens[3] || tokens[4]) {
tokens_free(tokens);
continue;
}
return tokens; return tokens;
} }