components/quagga/patches/23-cve-2011-3327.patch
author Brian Utterback <Brian.Utterback@Oracle.COM>
Wed, 09 Nov 2011 09:11:11 -0800
changeset 576 507cfe0a7b1e
permissions -rw-r--r--
7090778 Problem with network/quagga
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
576
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
     1
--- bgpd/bgp_ecommunity.c
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
     2
+++ bgpd/bgp_ecommunity.c
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
     3
@@ -568,6 +568,13 @@
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
     4
 
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
     5
   for (i = 0; i < ecom->size; i++)
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
     6
     {
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
     7
+      /* Make sure the size is large enough. */
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
     8
+      while (str_pnt + ECOMMUNITY_STR_DEFAULT_LEN >= str_size)
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
     9
+	{
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    10
+	  str_size *= 2;
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    11
+	  str_buf = XREALLOC (MTYPE_ECOMMUNITY_STR, str_buf, str_size);
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    12
+	}
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    13
+
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    14
       /* Space between each value.  */
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    15
       if (! first)
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    16
 	str_buf[str_pnt++] = ' ';
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    17
@@ -610,13 +617,6 @@
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    18
 	  break;
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    19
 	}
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    20
 
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    21
-      /* Make it sure size is enough.  */
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    22
-      while (str_pnt + ECOMMUNITY_STR_DEFAULT_LEN >= str_size)
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    23
-	{
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    24
-	  str_size *= 2;
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    25
-	  str_buf = XREALLOC (MTYPE_ECOMMUNITY_STR, str_buf, str_size);
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    26
-	}
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    27
-
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    28
       /* Put string into buffer.  */
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    29
       if (encode == ECOMMUNITY_ENCODE_AS)
507cfe0a7b1e 7090778 Problem with network/quagga
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset
    30
 	{