41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
From 7a5d2b67b8bee753735d4b03f66c4054d9b812f9 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
|
|
|
|
Upstream-commit: ba1dbd78e5f1ed67c1b8d37ac89d90e5e330b628
|
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
---
|
|
lib/smtp.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/smtp.c b/lib/smtp.c
|
|
index 3f3b45a..400ad54 100644
|
|
--- a/lib/smtp.c
|
|
+++ b/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;
|
|
--
|
|
2.14.4
|
|
|