From 3127e968c9e9bb2ba302553ba4eeeb030b1eee53 Mon Sep 17 00:00:00 2001 From: Sona Sarmadi Date: Tue, 15 Nov 2016 10:08:19 +0100 Subject: curl: CVE-2016-8624 invalid URL parsing with '#' Affected versions: curl 7.1 to and including 7.50.3 Reference: https://curl.haxx.se/docs/adv_20161102J.html Signed-off-by: Sona Sarmadi Signed-off-by: Armin Kuster --- meta/recipes-support/curl/curl/CVE-2016-8624.patch | 51 ++++++++++++++++++++++ meta/recipes-support/curl/curl_7.47.1.bb | 1 + 2 files changed, 52 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2016-8624.patch (limited to 'meta') diff --git a/meta/recipes-support/curl/curl/CVE-2016-8624.patch b/meta/recipes-support/curl/curl/CVE-2016-8624.patch new file mode 100644 index 0000000000..009f7d0601 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2016-8624.patch @@ -0,0 +1,51 @@ +From 3bb273db7e40ebc284cff45f3ce3f0475c8339c2 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Tue, 11 Oct 2016 00:48:35 +0200 +Subject: [PATCH] urlparse: accept '#' as end of host name + +'http://example.com#@127.0.0.1/x.txt' equals a request to example.com +for the '/' document with the rest of the URL being a fragment. + +CVE: CVE-2016-8624 +Upstream-Status: Backport + +Bug: https://curl.haxx.se/docs/adv_20161102J.html +Reported-by: Fernando Muñoz + +Signed-off-by: Sona Sarmadi + +diff -ruN a/lib/url.c b/lib/url.c +--- a/lib/url.c 2016-11-07 08:50:23.030126833 +0100 ++++ b/lib/url.c 2016-11-07 10:16:13.562089428 +0100 +@@ -4086,7 +4086,7 @@ + path[0]=0; + + if(2 > sscanf(data->change.url, +- "%15[^\n:]://%[^\n/?]%[^\n]", ++ "%15[^\n:]://%[^\n/?#]%[^\n]", + protobuf, + conn->host.name, path)) { + +@@ -4094,7 +4094,7 @@ + * The URL was badly formatted, let's try the browser-style _without_ + * protocol specified like 'http://'. + */ +- rc = sscanf(data->change.url, "%[^\n/?]%[^\n]", conn->host.name, path); ++ rc = sscanf(data->change.url, "%[^\n/?#]%[^\n]", conn->host.name, path); + if(1 > rc) { + /* + * We couldn't even get this format. +@@ -4184,10 +4184,10 @@ + } + + /* If the URL is malformatted (missing a '/' after hostname before path) we +- * insert a slash here. The only letter except '/' we accept to start a path +- * is '?'. ++ * insert a slash here. The only letters except '/' that can start a path is ++ * '?' and '#' - as controlled by the two sscanf() patterns above. + */ +- if(path[0] == '?') { ++ if(path[0] != '/') { + /* We need this function to deal with overlapping memory areas. We know + that the memory area 'path' points to is 'urllen' bytes big and that + is bigger than the path. Use +1 to move the zero byte too. */ diff --git a/meta/recipes-support/curl/curl_7.47.1.bb b/meta/recipes-support/curl/curl_7.47.1.bb index 0f8fa3ab6f..3c877e4dc2 100644 --- a/meta/recipes-support/curl/curl_7.47.1.bb +++ b/meta/recipes-support/curl/curl_7.47.1.bb @@ -24,6 +24,7 @@ SRC_URI += " file://configure_ac.patch \ file://CVE-2016-8621.patch \ file://CVE-2016-8622.patch \ file://CVE-2016-8623.patch \ + file://CVE-2016-8624.patch \ " SRC_URI[md5sum] = "9ea3123449439bbd960cd25cf98796fb" -- cgit 1.2.3-korg