new file mode 100644

@@ -0,0 +1,34 @@

+From ba1dbd78e5f1ed67c1b8d37ac89d90e5e330b628 Mon Sep 17 00:00:00 2001

+From: Daniel Stenberg <daniel@haxx.se>

+Date: Wed, 13 Jun 2018 12:24:40 +0200

+Subject: [PATCH] smtp: use the upload buffer size for scratch buffer malloc

+

+... not the read buffer size, as that can be set smaller and thus cause

+a buffer overflow! CVE-2018-0500

+

+Reported-by: Peter Wu

+Bug: https://curl.haxx.se/docs/adv_2018-70a2.html

+---

+ lib/smtp.c | 3 ++-

+ 1 file changed, 2 insertions(+), 1 deletion(-)

+

+diff --git a/lib/smtp.c b/lib/smtp.c

+index e6872badb8..ecf10a41ac 100644

+--- a/lib/smtp.c

+@@ -1563,13 +1563,14 @@ CURLcode Curl_smtp_escape_eob(struct connectdata *conn, const ssize_t nread)

+   if(!scratch || data->set.crlf) {

+     oldscratch = scratch;

+ 

+-    scratch = newscratch = malloc(2 * data->set.buffer_size);

++    scratch = newscratch = malloc(2 * UPLOAD_BUFSIZE);

+     if(!newscratch) {

+       failf(data, "Failed to alloc scratch buffer!");

+ 

+       return CURLE_OUT_OF_MEMORY;

+     }

+   }

++  DEBUGASSERT(UPLOAD_BUFSIZE >= nread);

+ 

+   /* Have we already sent part of the EOB? */

+   eob_sent = smtp->eob;

@@ -1,7 +1,7 @@

 Summary:        An URL retrieval utility and library

 Name:           curl

 Version:        7.59.0

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        MIT

 URL:            http://curl.haxx.se

 Group:          System Environment/NetworkingLibraries

@@ -11,6 +11,7 @@ Source0:        http://curl.haxx.se/download/%{name}-%{version}.tar.gz

 %define sha1    curl=1a9bd7e201e645207b23a4b4dc38a32cc494a638

 Patch0:         curl-CVE-2018-1000300.patch

 Patch1:         curl-CVE-2018-1000301.patch

+Patch2:         curl-CVE-2018-0500.patch

 BuildRequires:  ca-certificates

 BuildRequires:  openssl-devel

 BuildRequires:  krb5-devel

@@ -45,6 +46,7 @@ This package contains minimal set of shared curl libraries.

 %setup -q

 %patch0 -p1

 %patch1 -p1

+%patch2 -p1

 %build

 ./configure \

     CFLAGS="%{optflags}" \

@@ -92,6 +94,8 @@ rm -rf %{buildroot}/*

 %{_libdir}/libcurl.so.*

 %changelog

+*   Tue Sep 18 2018 Keerthana K <keerthanak@vmware.com> 7.59.0-3

+-   Fix for CVE-2018-0500

 *   Thu Jul 05 2018 Keerthana K <keerthanak@vmware.com> 7.59.0-2

 -   Fix for CVE-2018-1000300, CVE-2018-1000301.

 *   Wed Apr 04 2018 Dheeraj Shetty <dheerajs@vmware.com> 7.59.0-1