summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-11-19 06:41:53 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-20 10:32:16 +0000
commita00ca26adb557430b8fd5771820c47e1e2469e11 (patch)
treeab4c85a0adb469058da10f88e6791bbed18c0430 /meta
parentaa24e1aaf84a2721fc58b43e458cb94f197f5677 (diff)
downloadpoky-a00ca26adb557430b8fd5771820c47e1e2469e11.tar.gz
curl: update to 7.62.0
Drop all CVE patches now included in update. For details see: https://curl.haxx.se/changes.html (From OE-Core rev: 43a802c2605cd2f6095a7738347338492eafe722) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/curl/curl/CVE-2018-14618.patch37
-rw-r--r--meta/recipes-support/curl/curl/CVE-2018-16839.patch35
-rw-r--r--meta/recipes-support/curl/curl/CVE-2018-16840.patch43
-rw-r--r--meta/recipes-support/curl/curl/CVE-2018-16842.patch35
-rw-r--r--meta/recipes-support/curl/curl_7.62.0.bb (renamed from meta/recipes-support/curl/curl_7.61.0.bb)8
5 files changed, 2 insertions, 156 deletions
diff --git a/meta/recipes-support/curl/curl/CVE-2018-14618.patch b/meta/recipes-support/curl/curl/CVE-2018-14618.patch
deleted file mode 100644
index db07b436d3..0000000000
--- a/meta/recipes-support/curl/curl/CVE-2018-14618.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 57d299a499155d4b327e341c6024e293b0418243 Mon Sep 17 00:00:00 2001
2From: Daniel Stenberg <daniel@haxx.se>
3Date: Mon, 13 Aug 2018 10:35:52 +0200
4Subject: [PATCH] Curl_ntlm_core_mk_nt_hash: return error on too long password
5
6... since it would cause an integer overflow if longer than (max size_t
7/ 2).
8
9This is CVE-2018-14618
10
11Bug: https://curl.haxx.se/docs/CVE-2018-14618.html
12Closes #2756
13Reported-by: Zhaoyang Wu
14
15CVE: CVE-2018-14618
16Upstream-Status: Backport
17Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
18---
19 lib/curl_ntlm_core.c | 5 ++++-
20 1 file changed, 4 insertions(+), 1 deletion(-)
21
22diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
23index e27cab353c..922e85a926 100644
24--- a/lib/curl_ntlm_core.c
25+++ b/lib/curl_ntlm_core.c
26@@ -557,8 +557,11 @@ CURLcode Curl_ntlm_core_mk_nt_hash(struct Curl_easy *data,
27 unsigned char *ntbuffer /* 21 bytes */)
28 {
29 size_t len = strlen(password);
30- unsigned char *pw = len ? malloc(len * 2) : strdup("");
31+ unsigned char *pw;
32 CURLcode result;
33+ if(len > SIZE_T_MAX/2) /* avoid integer overflow */
34+ return CURLE_OUT_OF_MEMORY;
35+ pw = len ? malloc(len * 2) : strdup("");
36 if(!pw)
37 return CURLE_OUT_OF_MEMORY;
diff --git a/meta/recipes-support/curl/curl/CVE-2018-16839.patch b/meta/recipes-support/curl/curl/CVE-2018-16839.patch
deleted file mode 100644
index bf972d2ed7..0000000000
--- a/meta/recipes-support/curl/curl/CVE-2018-16839.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 55b90532f9190dce40a325b3312d014c66dc3ae1 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 1 Nov 2018 15:27:35 +0800
4Subject: [PATCH] Curl_auth_create_plain_message: fix too-large-input-check
5
6CVE-2018-16839
7Reported-by: Harry Sintonen
8Bug: https://curl.haxx.se/docs/CVE-2018-16839.html
9
10Upstream-Status: Backport [https://github.com/curl/curl/commit
11/f3a24d7916b9173c69a3e0ee790102993833d6c5?diff=unified]
12
13CVE: CVE-2018-16839
14
15Signed-off-by: Changqing Li <changqing.li@windriver.com>
16---
17 lib/vauth/cleartext.c | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/lib/vauth/cleartext.c b/lib/vauth/cleartext.c
21index 5d61ce6..1367143 100644
22--- a/lib/vauth/cleartext.c
23+++ b/lib/vauth/cleartext.c
24@@ -74,7 +74,7 @@ CURLcode Curl_auth_create_plain_message(struct Curl_easy *data,
25 plen = strlen(passwdp);
26
27 /* Compute binary message length. Check for overflows. */
28- if((ulen > SIZE_T_MAX/2) || (plen > (SIZE_T_MAX/2 - 2)))
29+ if((ulen > SIZE_T_MAX/4) || (plen > (SIZE_T_MAX/2 - 2)))
30 return CURLE_OUT_OF_MEMORY;
31 plainlen = 2 * ulen + plen + 2;
32
33--
342.7.4
35
diff --git a/meta/recipes-support/curl/curl/CVE-2018-16840.patch b/meta/recipes-support/curl/curl/CVE-2018-16840.patch
deleted file mode 100644
index 3d086c4d90..0000000000
--- a/meta/recipes-support/curl/curl/CVE-2018-16840.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 3c2846bec008e03d456e181d9ab55686da83f140 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 1 Nov 2018 15:33:35 +0800
4Subject: [PATCH] Curl_close: clear data->multi_easy on free to avoid
5 use-after-free
6
7Regression from b46cfbc (7.59.0)
8CVE-2018-16840
9Reported-by: Brian Carpenter (Geeknik Labs)
10
11Bug: https://curl.haxx.se/docs/CVE-2018-16840.html
12
13Upstream-Status: Backport [https://github.com/curl/curl/commit/
1481d135d67155c5295b1033679c606165d4e28f3f]
15
16CVE: CVE-2018-16840
17
18Signed-off-by: Changqing Li <changqing.li@windriver.com>
19---
20 lib/url.c | 4 +++-
21 1 file changed, 3 insertions(+), 1 deletion(-)
22
23diff --git a/lib/url.c b/lib/url.c
24index 27b2c1e..7ef7c20 100644
25--- a/lib/url.c
26+++ b/lib/url.c
27@@ -320,10 +320,12 @@ CURLcode Curl_close(struct Curl_easy *data)
28 and detach this handle from there. */
29 curl_multi_remove_handle(data->multi, data);
30
31- if(data->multi_easy)
32+ if(data->multi_easy) {
33 /* when curl_easy_perform() is used, it creates its own multi handle to
34 use and this is the one */
35 curl_multi_cleanup(data->multi_easy);
36+ data->multi_easy = NULL;
37+ }
38
39 /* Destroy the timeout list that is held in the easy handle. It is
40 /normally/ done by curl_multi_remove_handle() but this is "just in
41--
422.7.4
43
diff --git a/meta/recipes-support/curl/curl/CVE-2018-16842.patch b/meta/recipes-support/curl/curl/CVE-2018-16842.patch
deleted file mode 100644
index 82e7557063..0000000000
--- a/meta/recipes-support/curl/curl/CVE-2018-16842.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 0e4a6058b130f07cfa52fde8a3cb6f2abfe4c700 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 1 Nov 2018 15:30:56 +0800
4Subject: [PATCH] voutf: fix bad arethmetic when outputting warnings to stderr
5
6CVE-2018-16842
7Reported-by: Brian Carpenter
8Bug: https://curl.haxx.se/docs/CVE-2018-16842.html
9
10Upstream-Status: Backport [https://github.com/curl/curl/commit
11/d530e92f59ae9bb2d47066c3c460b25d2ffeb211]
12
13CVE: CVE-2018-16842
14
15Signed-off-by: Changqing Li <changqing.li@windriver.com>
16---
17 src/tool_msgs.c | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/src/tool_msgs.c b/src/tool_msgs.c
21index 9cce806..05bec39 100644
22--- a/src/tool_msgs.c
23+++ b/src/tool_msgs.c
24@@ -67,7 +67,7 @@ static void voutf(struct GlobalConfig *config,
25 (void)fwrite(ptr, cut + 1, 1, config->errors);
26 fputs("\n", config->errors);
27 ptr += cut + 1; /* skip the space too */
28- len -= cut;
29+ len -= cut + 1;
30 }
31 else {
32 fputs(ptr, config->errors);
33--
342.7.4
35
diff --git a/meta/recipes-support/curl/curl_7.61.0.bb b/meta/recipes-support/curl/curl_7.62.0.bb
index 56327a632b..2baab2b503 100644
--- a/meta/recipes-support/curl/curl_7.61.0.bb
+++ b/meta/recipes-support/curl/curl_7.62.0.bb
@@ -7,14 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ef889a37a5a874490ac7ce116396f29a"
7 7
8SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ 8SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
9 file://0001-replace-krb5-config-with-pkg-config.patch \ 9 file://0001-replace-krb5-config-with-pkg-config.patch \
10 file://CVE-2018-14618.patch \
11 file://CVE-2018-16839.patch \
12 file://CVE-2018-16840.patch \
13 file://CVE-2018-16842.patch \
14" 10"
15 11
16SRC_URI[md5sum] = "31d0a9f48dc796a7db351898a1e5058a" 12SRC_URI[md5sum] = "7adf426f80c68bbdd04d44b9bc171d61"
17SRC_URI[sha256sum] = "5f6f336921cf5b84de56afbd08dfb70adeef2303751ffb3e570c936c6d656c9c" 13SRC_URI[sha256sum] = "7802c54076500be500b171fde786258579d60547a3a35b8c5a23d8c88e8f9620"
18 14
19CVE_PRODUCT = "curl libcurl" 15CVE_PRODUCT = "curl libcurl"
20inherit autotools pkgconfig binconfig multilib_header 16inherit autotools pkgconfig binconfig multilib_header