Attachment 644661 Details for Bug 871612 – CVE-2012-4559-Make-sure-we-don-t-free-name-and-longn.patch

[patch] CVE-2012-4559-Make-sure-we-don-t-free-name-and-longn.patch

0009-CVE-2012-4559-Make-sure-we-don-t-free-name-and-longn.patch (text/plain), 2.37 KB, created by Andreas Schneider on 2012-11-14 08:49:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

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

Size: 2.37 KB

patch

obsolete

>From 3ed6457d0810dd8be0a2801b47539c3dfc607916 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@cryptomilk.org>
>Date: Fri, 5 Oct 2012 14:46:36 +0200
>Subject: [PATCH 09/11] CVE-2012-4559: Make sure we don't free name and
> longname twice on error.
>
>
>Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
>---
> src/sftp.c | 26 ++++++++++++++++----------
> 1 file changed, 16 insertions(+), 10 deletions(-)
>
>diff --git a/src/sftp.c b/src/sftp.c
>index d41b643..9912958 100644
>--- a/src/sftp.c
>+++ b/src/sftp.c
>@@ -1203,8 +1203,8 @@ static char *sftp_parse_longname(const char *longname,
>                    so that number of pairs equals extended_count              */
> static sftp_attributes sftp_parse_attr_3(sftp_session sftp, ssh_buffer buf,
>     int expectname) {
>-  ssh_string longname = NULL;
>-  ssh_string name = NULL;
>+  ssh_string longname;
>+  ssh_string name;
>   sftp_attributes attr;
>   uint32_t flags = 0;
>   int ok = 0;
>@@ -1219,19 +1219,27 @@ static sftp_attributes sftp_parse_attr_3(sftp_session sftp, ssh_buffer buf,
>   /* This isn't really a loop, but it is like a try..catch.. */
>   do {
>     if (expectname) {
>-      if ((name = buffer_get_ssh_string(buf)) == NULL ||
>-          (attr->name = ssh_string_to_char(name)) == NULL) {
>-        break;
>+      name = buffer_get_ssh_string(buf);
>+      if (name == NULL) {
>+          break;
>       }
>+      attr->name = ssh_string_to_char(name);
>       ssh_string_free(name);
>+      if (attr->name == NULL) {
>+          break;
>+      }
> 
>       ssh_log(sftp->session, SSH_LOG_RARE, "Name: %s", attr->name);
> 
>-      if ((longname=buffer_get_ssh_string(buf)) == NULL ||
>-          (attr->longname=ssh_string_to_char(longname)) == NULL) {
>-        break;
>+      longname = buffer_get_ssh_string(buf);
>+      if (longname == NULL) {
>+          break;
>       }
>+      attr->longname = ssh_string_to_char(longname);
>       ssh_string_free(longname);
>+      if (attr->longname == NULL) {
>+        break;
>+      }
> 
>       /* Set owner and group if we talk to openssh and have the longname */
>       if (ssh_get_openssh_version(sftp->session)) {
>@@ -1336,8 +1344,6 @@ static sftp_attributes sftp_parse_attr_3(sftp_session sftp, ssh_buffer buf,
> 
>   if (!ok) {
>     /* break issued somewhere */
>-    ssh_string_free(name);
>-    ssh_string_free(longname);
>     ssh_string_free(attr->extended_type);
>     ssh_string_free(attr->extended_data);
>     SAFE_FREE(attr->name);
>-- 
>1.8.0
>

Actions: View | Diff

Attachments on bug 871612: 644659 | 644660 | 644661 | 644984 | 644985 | 644986