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

CVE-2012-4561: Fix error handling of try_publickey_from_file().

Browse Source
This commit is contained in:
Andreas Schneider
2012-10-05 14:56:56 +02:00
parent 46b2eb3c14
commit 455da60846
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/keyfiles.c
View File

@@ -1214,7 +1214,7 @@ ssh_string try_publickey_from_file(ssh_session session, struct ssh_keys_struct k
const char *priv; const char *priv;
const char *pub; const char *pub;
char *new; char *new;
ssh_string pubkey=NULL; ssh_string pubkey;
pub = keytab.publickey; pub = keytab.publickey;
if (pub == NULL) { if (pub == NULL) {
@@ -1234,13 +1234,13 @@ ssh_string try_publickey_from_file(ssh_session session, struct ssh_keys_struct k
ssh_log(session, SSH_LOG_PACKET, "Trying to open publickey %s", pub); ssh_log(session, SSH_LOG_PACKET, "Trying to open publickey %s", pub);
if (!ssh_file_readaccess_ok(pub)) { if (!ssh_file_readaccess_ok(pub)) {
ssh_log(session, SSH_LOG_PACKET, "Failed to open publickey %s", pub); ssh_log(session, SSH_LOG_PACKET, "Failed to open publickey %s", pub);
goto error; return NULL;
} }
ssh_log(session, SSH_LOG_PACKET, "Trying to open privatekey %s", priv); ssh_log(session, SSH_LOG_PACKET, "Trying to open privatekey %s", priv);
if (!ssh_file_readaccess_ok(priv)) { if (!ssh_file_readaccess_ok(priv)) {
ssh_log(session, SSH_LOG_PACKET, "Failed to open privatekey %s", priv); ssh_log(session, SSH_LOG_PACKET, "Failed to open privatekey %s", priv);
goto error; return NULL;
} }
ssh_log(session, SSH_LOG_PACKET, "Success opening public and private key"); ssh_log(session, SSH_LOG_PACKET, "Success opening public and private key");
@@ -1255,18 +1255,18 @@ ssh_string try_publickey_from_file(ssh_session session, struct ssh_keys_struct k
"Wasn't able to open public key file %s: %s", "Wasn't able to open public key file %s: %s",
pub, pub,
ssh_get_error(session)); ssh_get_error(session));
goto error; return NULL;
} }
new = realloc(*privkeyfile, strlen(priv) + 1); new = realloc(*privkeyfile, strlen(priv) + 1);
if (new == NULL) { if (new == NULL) {
ssh_string_free(pubkey); ssh_string_free(pubkey);
goto error; return NULL;
} }
strcpy(new, priv); strcpy(new, priv);
*privkeyfile = new; *privkeyfile = new;
error:
return pubkey; return pubkey;
} }