From dac11f1d100aff1bad7f82734282c2d4ad1273da Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Wed, 6 Feb 2019 13:28:38 +0100
Subject: [PATCH] Resolves: CVE-2019-3823 - fix SMTP end-of-response
 out-of-bounds read

---
 0011-curl-7.61.1-CVE-2019-3823.patch | 50 ++++++++++++++++++++++++++++
 curl.spec                            |  5 +++
 2 files changed, 55 insertions(+)
 create mode 100644 0011-curl-7.61.1-CVE-2019-3823.patch

diff --git a/0011-curl-7.61.1-CVE-2019-3823.patch b/0011-curl-7.61.1-CVE-2019-3823.patch
new file mode 100644
index 0000000..d1d259f
--- /dev/null
+++ b/0011-curl-7.61.1-CVE-2019-3823.patch
@@ -0,0 +1,50 @@
+From d26f1025d0a0a6c602d758a2e0917759492473e9 Mon Sep 17 00:00:00 2001
+From: Daniel Gustafsson <daniel@yesql.se>
+Date: Sat, 19 Jan 2019 00:42:47 +0100
+Subject: [PATCH] smtp: avoid risk of buffer overflow in strtol
+
+If the incoming len 5, but the buffer does not have a termination
+after 5 bytes, the strtol() call may keep reading through the line
+buffer until is exceeds its boundary. Fix by ensuring that we are
+using a bounded read with a temporary buffer on the stack.
+
+Bug: https://curl.haxx.se/docs/CVE-2019-3823.html
+Reported-by: Brian Carpenter (Geeknik Labs)
+CVE-2019-3823
+
+Upstream-commit: 39df4073e5413fcdbb5a38da0c1ce6f1c0ceb484
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ lib/smtp.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/lib/smtp.c b/lib/smtp.c
+index ecf10a4..1b9f92d 100644
+--- a/lib/smtp.c
++++ b/lib/smtp.c
+@@ -5,7 +5,7 @@
+  *                            | (__| |_| |  _ <| |___
+  *                             \___|\___/|_| \_\_____|
+  *
+- * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
++ * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
+  *
+  * This software is licensed as described in the file COPYING, which
+  * you should have received as part of this distribution. The terms
+@@ -207,8 +207,12 @@ static bool smtp_endofresp(struct connectdata *conn, char *line, size_t len,
+      Section 4. Examples of RFC-4954 but some e-mail servers ignore this and
+      only send the response code instead as per Section 4.2. */
+   if(line[3] == ' ' || len == 5) {
++    char tmpline[6];
++
+     result = TRUE;
+-    *resp = curlx_sltosi(strtol(line, NULL, 10));
++    memset(tmpline, '\0', sizeof(tmpline));
++    memcpy(tmpline, line, (len == 5 ? 5 : 3));
++    *resp = curlx_sltosi(strtol(tmpline, NULL, 10));
+ 
+     /* Make sure real server never sends internal value */
+     if(*resp == 1)
+-- 
+2.17.2
+
diff --git a/curl.spec b/curl.spec
index 3fd58c9..81a0130 100644
--- a/curl.spec
+++ b/curl.spec
@@ -37,6 +37,9 @@ Patch9:   0009-curl-7.61.1-CVE-2018-16890.patch
 # fix NTLMv2 type-3 header stack buffer overflow (CVE-2019-3822)
 Patch10:  0010-curl-7.61.1-CVE-2019-3822.patch
 
+# fix SMTP end-of-response out-of-bounds read (CVE-2019-3823)
+Patch11:  0011-curl-7.61.1-CVE-2019-3823.patch
+
 # patch making libcurl multilib ready
 Patch101: 0101-curl-7.32.0-multilib.patch
 
@@ -206,6 +209,7 @@ git apply %{PATCH4}
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 # Fedora patches
 %patch101 -p1
@@ -373,6 +377,7 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
 
 %changelog
 * Wed Feb 06 2019 Kamil Dudka <kdudka@redhat.com> - 7.61.1-8
+- fix SMTP end-of-response out-of-bounds read (CVE-2019-3823)
 - fix NTLMv2 type-3 header stack buffer overflow (CVE-2019-3822)
 - fix NTLM type-2 out-of-bounds buffer read (CVE-2018-16890)