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

kex: NULL checks for 'first_kex_packet_follows'

Browse Source 
Add NULL checks to 'is_first_kex_packet_follows_guess_wrong'
to ensure that a 'strdup(NULL)' path can not be taken.

Signed-off-by: Jon Simons <jon@jonsimons.org>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Jon Simons
2014-04-22 01:11:03 -07:00
committed by Andreas Schneider
parent f37c844bf7
commit 9e4bc10525
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/kex.c
View File

@@ -286,7 +286,13 @@ static int is_first_kex_packet_follows_guess_wrong(const char *client_kex,
const char *server_kex) { const char *server_kex) {
int is_wrong = 1; int is_wrong = 1;
char **server_kex_tokens = NULL; char **server_kex_tokens = NULL;
char **client_kex_tokens = tokenize(client_kex); char **client_kex_tokens = NULL;
if ((client_kex == NULL) || (server_kex == NULL)) {
goto out;
}
client_kex_tokens = tokenize(client_kex);
if (client_kex_tokens == NULL) { if (client_kex_tokens == NULL) {
goto out; goto out;
@@ -416,17 +422,17 @@ SSH_PACKET_CALLBACK(ssh_packet_kexinit){
if (rc < 0) { if (rc < 0) {
goto error; goto error;
} }
}
/* /*
* Remember whether 'first_kex_packet_follows' was set and the client * Remember whether 'first_kex_packet_follows' was set and the client
* guess was wrong: in this case the next SSH_MSG_KEXDH_INIT message * guess was wrong: in this case the next SSH_MSG_KEXDH_INIT message
* must be ignored. * must be ignored.
*/ */
if (server_kex && first_kex_packet_follows) { if (first_kex_packet_follows) {
session->first_kex_follows_guess_wrong = session->first_kex_follows_guess_wrong =
is_first_kex_packet_follows_guess_wrong(session->next_crypto->client_kex.methods[SSH_KEX], is_first_kex_packet_follows_guess_wrong(session->next_crypto->client_kex.methods[SSH_KEX],
session->next_crypto->server_kex.methods[SSH_KEX]); session->next_crypto->server_kex.methods[SSH_KEX]);
}
} }
session->session_state = SSH_SESSION_STATE_KEXINIT_RECEIVED; session->session_state = SSH_SESSION_STATE_KEXINIT_RECEIVED;