Blame SOURCES/0068-curl-7.29.0-CVE-2018-14618.patch

9d7d3f
From 3bae605ce08375120f34761e5a4364253276ec88 Mon Sep 17 00:00:00 2001
9d7d3f
From: Daniel Stenberg <daniel@haxx.se>
9d7d3f
Date: Sat, 4 Nov 2017 16:42:21 +0100
9d7d3f
Subject: [PATCH 1/2] ntlm: avoid malloc(0) for zero length passwords
9d7d3f
9d7d3f
It triggers an assert() when built with memdebug since malloc(0) may
9d7d3f
return NULL *or* a valid pointer.
9d7d3f
9d7d3f
Detected by OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=4054
9d7d3f
9d7d3f
Assisted-by: Max Dymond
9d7d3f
Closes #2054
9d7d3f
9d7d3f
Upstream-commit: 685ef130575cdcf63fe9547757d88a49a40ef281
9d7d3f
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
9d7d3f
---
9d7d3f
 lib/curl_ntlm_core.c | 2 +-
9d7d3f
 1 file changed, 1 insertion(+), 1 deletion(-)
9d7d3f
9d7d3f
diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
9d7d3f
index 8f3c00d..459f6f9 100644
9d7d3f
--- a/lib/curl_ntlm_core.c
9d7d3f
+++ b/lib/curl_ntlm_core.c
9d7d3f
@@ -385,7 +385,7 @@ CURLcode Curl_ntlm_core_mk_nt_hash(struct SessionHandle *data,
9d7d3f
                                    unsigned char *ntbuffer /* 21 bytes */)
9d7d3f
 {
9d7d3f
   size_t len = strlen(password);
9d7d3f
-  unsigned char *pw = malloc(len * 2);
9d7d3f
+  unsigned char *pw = len ? malloc(len * 2) : strdup("");
9d7d3f
   CURLcode result;
9d7d3f
   if(!pw)
9d7d3f
     return CURLE_OUT_OF_MEMORY;
9d7d3f
-- 
9d7d3f
2.17.1
9d7d3f
9d7d3f
9d7d3f
From 4c20ad72a35f44c31241a916ccf9a789a01d5ab8 Mon Sep 17 00:00:00 2001
9d7d3f
From: Daniel Stenberg <daniel@haxx.se>
9d7d3f
Date: Mon, 13 Aug 2018 10:35:52 +0200
9d7d3f
Subject: [PATCH 2/2] Curl_ntlm_core_mk_nt_hash: return error on too long
9d7d3f
 password
9d7d3f
9d7d3f
... since it would cause an integer overflow if longer than (max size_t
9d7d3f
/ 2).
9d7d3f
9d7d3f
This is CVE-2018-14618
9d7d3f
9d7d3f
Bug: https://curl.haxx.se/docs/CVE-2018-14618.html
9d7d3f
Closes #2756
9d7d3f
Reported-by: Zhaoyang Wu
9d7d3f
9d7d3f
Upstream-commit: 57d299a499155d4b327e341c6024e293b0418243
9d7d3f
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
9d7d3f
---
9d7d3f
 lib/curl_ntlm_core.c | 14 +++++++++++++-
9d7d3f
 1 file changed, 13 insertions(+), 1 deletion(-)
9d7d3f
9d7d3f
diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
9d7d3f
index 459f6f9..1b6551f 100644
9d7d3f
--- a/lib/curl_ntlm_core.c
9d7d3f
+++ b/lib/curl_ntlm_core.c
9d7d3f
@@ -128,6 +128,15 @@ static void setup_des_key(const unsigned char *key_56,
9d7d3f
 
9d7d3f
 #else /* defined(USE_SSLEAY) */
9d7d3f
 
9d7d3f
+#ifndef SIZE_T_MAX
9d7d3f
+/* some limits.h headers have this defined, some don't */
9d7d3f
+#if defined(SIZEOF_SIZE_T) && (SIZEOF_SIZE_T > 4)
9d7d3f
+#define SIZE_T_MAX 18446744073709551615U
9d7d3f
+#else
9d7d3f
+#define SIZE_T_MAX 4294967295U
9d7d3f
+#endif
9d7d3f
+#endif
9d7d3f
+
9d7d3f
 /*
9d7d3f
  * Turns a 56 bit key into the 64 bit, odd parity key.  Used by GnuTLS and NSS.
9d7d3f
  */
9d7d3f
@@ -385,8 +394,11 @@ CURLcode Curl_ntlm_core_mk_nt_hash(struct SessionHandle *data,
9d7d3f
                                    unsigned char *ntbuffer /* 21 bytes */)
9d7d3f
 {
9d7d3f
   size_t len = strlen(password);
9d7d3f
-  unsigned char *pw = len ? malloc(len * 2) : strdup("");
9d7d3f
+  unsigned char *pw;
9d7d3f
   CURLcode result;
9d7d3f
+  if(len > SIZE_T_MAX/2) /* avoid integer overflow */
9d7d3f
+    return CURLE_OUT_OF_MEMORY;
9d7d3f
+  pw = len ? malloc(len * 2) : strdup("");
9d7d3f
   if(!pw)
9d7d3f
     return CURLE_OUT_OF_MEMORY;
9d7d3f
 
9d7d3f
-- 
9d7d3f
2.17.1
9d7d3f