Attachment 644662 Details for Bug 871617 – CVE-2012-4561-Fix-error-handling-of-try_publickey_fr.patch

[patch] CVE-2012-4561-Fix-error-handling-of-try_publickey_fr.patch

0010-CVE-2012-4561-Fix-error-handling-of-try_publickey_fr.patch (text/plain), 1.85 KB, created by Andreas Schneider on 2012-11-14 08:49:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2012-11-14 08:49:57 UTC

Size: 1.85 KB

patch

obsolete

>From 5bfb04826fd990670110db12d41cd5a79f4e3fce Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@cryptomilk.org>
>Date: Fri, 5 Oct 2012 14:56:56 +0200
>Subject: [PATCH 10/11] CVE-2012-4561: Fix error handling of
> try_publickey_from_file().
>
>
>Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
>---
> src/keyfiles.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/src/keyfiles.c b/src/keyfiles.c
>index b7c2425..5c33581 100644
>--- a/src/keyfiles.c
>+++ b/src/keyfiles.c
>@@ -1214,7 +1214,7 @@ ssh_string try_publickey_from_file(ssh_session session, struct ssh_keys_struct k
>   const char *priv;
>   const char *pub;
>   char *new;
>-  ssh_string pubkey=NULL;
>+  ssh_string pubkey;
> 
>   pub = keytab.publickey;
>   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);
>   if (!ssh_file_readaccess_ok(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);
>   if (!ssh_file_readaccess_ok(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");
>@@ -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",
>         pub,
>         ssh_get_error(session));
>-    goto error;
>+    return NULL;
>   }
> 
>   new = realloc(*privkeyfile, strlen(priv) + 1);
>   if (new == NULL) {
>     ssh_string_free(pubkey);
>-    goto error;
>+    return NULL;
>   }
> 
>   strcpy(new, priv);
>   *privkeyfile = new;
>-error:
>+
>   return pubkey;
> }
> 
>-- 
>1.8.0
>

Actions: View | Diff

Attachments on bug 871617: 644662 | 644663 | 644998 | 644999