diff options
-rw-r--r-- | meta/recipes-support/curl/curl/CVE-2016-8617.patch | 30 | ||||
-rw-r--r-- | meta/recipes-support/curl/curl_7.50.1.bb | 1 |
2 files changed, 31 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..167f2faee3 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2016-8617.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 32ae8ba41b5dbf26dabe884ac4aa12597d1d96b9 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 | Upstream-Status: Backport | ||
7 | CVE: CVE-2016-8617 | ||
8 | |||
9 | Signed-off-by: Thiruvadi Rajaraman <trajaraman@mvista.com> | ||
10 | |||
11 | --- | ||
12 | lib/base64.c | 5 +++++ | ||
13 | 1 file changed, 5 insertions(+) | ||
14 | |||
15 | Index: curl-7.50.1/lib/base64.c | ||
16 | =================================================================== | ||
17 | --- curl-7.50.1.orig/lib/base64.c 2016-07-21 04:01:36.000000000 +0530 | ||
18 | +++ curl-7.50.1/lib/base64.c 2017-06-12 17:06:30.865546695 +0530 | ||
19 | @@ -190,6 +190,11 @@ | ||
20 | if(!insize) | ||
21 | insize = strlen(indata); | ||
22 | |||
23 | +#if SIZEOF_SIZE_T == 4 | ||
24 | + if(insize > UINT_MAX/4) | ||
25 | + return CURLE_OUT_OF_MEMORY; | ||
26 | +#endif | ||
27 | + | ||
28 | base64data = output = malloc(insize * 4 / 3 + 4); | ||
29 | if(!output) | ||
30 | return CURLE_OUT_OF_MEMORY; | ||
diff --git a/meta/recipes-support/curl/curl_7.50.1.bb b/meta/recipes-support/curl/curl_7.50.1.bb index 9a9741dfe1..ad7d83dac7 100644 --- a/meta/recipes-support/curl/curl_7.50.1.bb +++ b/meta/recipes-support/curl/curl_7.50.1.bb | |||
@@ -19,6 +19,7 @@ SRC_URI += " file://configure_ac.patch \ | |||
19 | file://CVE-2016-8620.patch \ | 19 | file://CVE-2016-8620.patch \ |
20 | file://CVE-2016-8621.patch \ | 20 | file://CVE-2016-8621.patch \ |
21 | file://CVE-2016-8623.patch \ | 21 | file://CVE-2016-8623.patch \ |
22 | file://CVE-2016-8617.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | SRC_URI[md5sum] = "015f6a0217ca6f2c5442ca406476920b" | 25 | SRC_URI[md5sum] = "015f6a0217ca6f2c5442ca406476920b" |