diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/curl/curl/CVE-2016-8617.patch | 28 | ||||
-rw-r--r-- | 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 0000000000..d16c2f5a63 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2016-8617.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From efd24d57426bd77c9b5860e6b297904703750412 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Stenberg <daniel@haxx.se> | ||
3 | Date: Wed, 28 Sep 2016 00:05:12 +0200 | ||
4 | Subject: [PATCH] base64: check for integer overflow on large input | ||
5 | |||
6 | CVE: CVE-2016-8617 | ||
7 | Upstream-Status: Backport | ||
8 | |||
9 | Bug: https://curl.haxx.se/docs/adv_20161102C.html | ||
10 | Reported-by: Cure53 | ||
11 | |||
12 | Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> | ||
13 | --- | ||
14 | diff -ruN a/lib/base64.c b/lib/base64.c | ||
15 | --- a/lib/base64.c 2016-02-03 00:02:43.000000000 +0100 | ||
16 | +++ b/lib/base64.c 2016-11-07 09:22:07.918167530 +0100 | ||
17 | @@ -190,6 +190,11 @@ | ||
18 | if(0 == insize) | ||
19 | insize = strlen(indata); | ||
20 | |||
21 | +#if SIZEOF_SIZE_T == 4 | ||
22 | + if(insize > UINT_MAX/4) | ||
23 | + return CURLE_OUT_OF_MEMORY; | ||
24 | +#endif | ||
25 | + | ||
26 | base64data = output = malloc(insize*4/3+4); | ||
27 | if(NULL == output) | ||
28 | 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 20c3721d53..37244110c3 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 \ | |||
17 | file://CVE-2016-7141.patch \ | 17 | file://CVE-2016-7141.patch \ |
18 | file://CVE-2016-8615.patch \ | 18 | file://CVE-2016-8615.patch \ |
19 | file://CVE-2016-8616.patch \ | 19 | file://CVE-2016-8616.patch \ |
20 | file://CVE-2016-8617.patch \ | ||
20 | " | 21 | " |
21 | 22 | ||
22 | SRC_URI[md5sum] = "9ea3123449439bbd960cd25cf98796fb" | 23 | SRC_URI[md5sum] = "9ea3123449439bbd960cd25cf98796fb" |