40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From 9b757a9a431f6859807d9f6e697cc2d2a120098d Mon Sep 17 00:00:00 2001
|
|
From: Daniel Stenberg <daniel@haxx.se>
|
|
Date: Fri, 23 Mar 2018 23:30:04 +0100
|
|
Subject: [PATCH 2/2] pingpong: fix response cache memcpy overflow
|
|
|
|
Response data for a handle with a large buffer might be cached and then
|
|
used with the "closure" handle when it has a smaller buffer and then the
|
|
larger cache will be copied and overflow the new smaller heap based
|
|
buffer.
|
|
|
|
Reported-by: Dario Weisser
|
|
CVE: CVE-2018-1000300
|
|
Bug: https://curl.haxx.se/docs/adv_2018-82c2.html
|
|
|
|
Upstream-commit: 583b42cb3b809b1bf597af160468ccba728c2248
|
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
---
|
|
lib/pingpong.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/pingpong.c b/lib/pingpong.c
|
|
index 438856a..ad370ee 100644
|
|
--- a/lib/pingpong.c
|
|
+++ b/lib/pingpong.c
|
|
@@ -304,7 +304,10 @@ CURLcode Curl_pp_readresp(curl_socket_t sockfd,
|
|
* it would have been populated with something of size int to begin
|
|
* with, even though its datatype may be larger than an int.
|
|
*/
|
|
- DEBUGASSERT((ptr + pp->cache_size) <= (buf + data->set.buffer_size + 1));
|
|
+ if((ptr + pp->cache_size) > (buf + data->set.buffer_size + 1)) {
|
|
+ failf(data, "cached response data too big to handle");
|
|
+ return CURLE_RECV_ERROR;
|
|
+ }
|
|
memcpy(ptr, pp->cache, pp->cache_size);
|
|
gotbytes = (ssize_t)pp->cache_size;
|
|
free(pp->cache); /* free the cache */
|
|
--
|
|
2.14.3
|
|
|