Attachment 645004 Details for Bug 871620 – CVE-2012-4562-Fix-a-possible-infinite-loop-in-buffer.patch

[patch] CVE-2012-4562-Fix-a-possible-infinite-loop-in-buffer.patch

0003-CVE-2012-4562-Fix-a-possible-infinite-loop-in-buffer.patch (text/plain), 1.22 KB, created by Andreas Schneider on 2012-11-14 16:47:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2012-11-14 16:47:05 UTC

Size: 1.22 KB

patch

obsolete

>From 1699adfa036ffc66c62fdbb784610445cbebfc6e Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@cryptomilk.org>
>Date: Fri, 12 Oct 2012 11:35:20 +0200
>Subject: [PATCH 03/13] CVE-2012-4562: Fix a possible infinite loop in
> buffer_reinit().
>
>If needed is bigger than the highest power of two or a which fits in an
>integer we will loop forever.
>
>Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
>---
> src/buffer.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
>diff --git a/src/buffer.c b/src/buffer.c
>index 3ffe6de..aef7e44 100644
>--- a/src/buffer.c
>+++ b/src/buffer.c
>@@ -111,13 +111,18 @@ void ssh_buffer_free(struct ssh_buffer_struct *buffer) {
>   SAFE_FREE(buffer);
> }
> 
>-static int realloc_buffer(struct ssh_buffer_struct *buffer, int needed) {
>-  int smallest = 1;
>-  char *new = NULL;
>+static int realloc_buffer(struct ssh_buffer_struct *buffer, size_t needed) {
>+  size_t smallest = 1;
>+  char *new;
>+
>   buffer_verify(buffer);
>+
>   /* Find the smallest power of two which is greater or equal to needed */
>   while(smallest <= needed) {
>-    smallest <<= 1;
>+      if (smallest == 0) {
>+          return -1;
>+      }
>+      smallest <<= 1;
>   }
>   needed = smallest;
>   new = realloc(buffer->data, needed);
>-- 
>1.8.0
>

Actions: View | Diff

Attachments on bug 871620: 645002 | 645003 | 645004 | 645018