[gnome-continuous-yocto/gnomeostree-3.22-krogoth: 179/246] curl: CVE-2016-8617

[Emmanuele Bassi <ebassi src gnome org>]

commit eb0dff0c985ebe3652a85af7ef0cbbf5c850d640
Author: Sona Sarmadi <sona sarmadi enea com>
Date:   Tue Nov 15 10:08:12 2016 +0100

    curl: CVE-2016-8617
    
    OOB write via unchecked multiplication
    
    Affected versions: curl 7.1 to and including 7.50.3
    
    Reference:
    https://curl.haxx.se/docs/adv_20161102C.html
    
    (From OE-Core rev: 82415212303d75ca9a6f15a9abda42c9675efde4)
    
    Signed-off-by: Sona Sarmadi <sona sarmadi enea com>
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-support/curl/curl/CVE-2016-8617.patch |   28 ++++++++++++++++++++
 meta/recipes-support/curl/curl_7.47.1.bb           |    1 +
 2 files changed, 29 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-support/curl/curl/CVE-2016-8617.patch 
b/meta/recipes-support/curl/curl/CVE-2016-8617.patch
new file mode 100644
index 0000000..d16c2f5
--- /dev/null
+++ b/meta/recipes-support/curl/curl/CVE-2016-8617.patch
@@ -0,0 +1,28 @@
+From efd24d57426bd77c9b5860e6b297904703750412 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel haxx se>
+Date: Wed, 28 Sep 2016 00:05:12 +0200
+Subject: [PATCH] base64: check for integer overflow on large input
+
+CVE: CVE-2016-8617
+Upstream-Status: Backport
+
+Bug: https://curl.haxx.se/docs/adv_20161102C.html
+Reported-by: Cure53
+
+Signed-off-by: Sona Sarmadi <sona sarmadi enea com>
+---
+diff -ruN a/lib/base64.c b/lib/base64.c
+--- a/lib/base64.c     2016-02-03 00:02:43.000000000 +0100
++++ b/lib/base64.c     2016-11-07 09:22:07.918167530 +0100
+@@ -190,6 +190,11 @@
+   if(0 == insize)
+     insize = strlen(indata);
+ 
++#if SIZEOF_SIZE_T == 4
++  if(insize > UINT_MAX/4)
++    return CURLE_OUT_OF_MEMORY;
++#endif
++
+   base64data = output = malloc(insize*4/3+4);
+   if(NULL == output)
+     return CURLE_OUT_OF_MEMORY;
diff --git a/meta/recipes-support/curl/curl_7.47.1.bb b/meta/recipes-support/curl/curl_7.47.1.bb
index 20c3721..3724411 100644
--- a/meta/recipes-support/curl/curl_7.47.1.bb
+++ b/meta/recipes-support/curl/curl_7.47.1.bb
@@ -17,6 +17,7 @@ SRC_URI += " file://configure_ac.patch \
              file://CVE-2016-7141.patch \
              file://CVE-2016-8615.patch \
              file://CVE-2016-8616.patch \
+             file://CVE-2016-8617.patch \
            "
 
 SRC_URI[md5sum] = "9ea3123449439bbd960cd25cf98796fb"