diff options
author | Remi Collet <fedora@famillecollet.com> | 2013-06-24 16:44:09 +0200 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2013-06-24 16:44:09 +0200 |
commit | 758da2152b096a93ff7e8f80fe1b7d46dcf11159 (patch) | |
tree | 8aad8c57f816f6a702581f975a930541e37da423 /0015-curl-7.27.0-192c4f78.patch | |
parent | 02be2ea830a7f9efb87c3f15492beebc549f8003 (diff) |
curl :add the patch
Diffstat (limited to '0015-curl-7.27.0-192c4f78.patch')
-rw-r--r-- | 0015-curl-7.27.0-192c4f78.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/0015-curl-7.27.0-192c4f78.patch b/0015-curl-7.27.0-192c4f78.patch new file mode 100644 index 0000000..299f386 --- /dev/null +++ b/0015-curl-7.27.0-192c4f78.patch @@ -0,0 +1,43 @@ +From 25089c2c69028f0549facf93f7bdbf7344277f09 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Sun, 19 May 2013 23:24:29 +0200 +Subject: [PATCH] Curl_urldecode: no peeking beyond end of input buffer + +Security problem: CVE-2013-2174 + +If a program would give a string like "%FF" to curl_easy_unescape() but +ask for it to decode only the first byte, it would still parse and +decode the full hex sequence. The function then not only read beyond the +allowed buffer but it would also deduct the *unsigned* counter variable +for how many more bytes there's left to read in the buffer by two, +making the counter wrap. Continuing this, the function would go on +reading beyond the buffer and soon writing beyond the allocated target +buffer... + +Bug: http://curl.haxx.se/docs/adv_20130622.html +Reported-by: Timo Sirainen + +[upstream commit 192c4f788d48f82c03e9cef40013f34370e90737] + +Signed-off-by: Kamil Dudka <kdudka@redhat.com> +--- + lib/escape.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/lib/escape.c b/lib/escape.c +index 6a26cf8..a567edb 100644 +--- a/lib/escape.c ++++ b/lib/escape.c +@@ -159,7 +159,8 @@ CURLcode Curl_urldecode(struct SessionHandle *data, + + while(--alloc > 0) { + in = *string; +- if(('%' == in) && ISXDIGIT(string[1]) && ISXDIGIT(string[2])) { ++ if(('%' == in) && (alloc > 2) && ++ ISXDIGIT(string[1]) && ISXDIGIT(string[2])) { + /* this is two hexadecimal digits following a '%' */ + char hexstr[3]; + char *ptr; +-- +1.7.1 + |