From e225939e7d4a3adf377eb354557148572a508cc7 Mon Sep 17 00:00:00 2001 From: Sona Sarmadi Date: Tue, 15 Nov 2016 10:08:11 +0100 Subject: curl: CVE-2016-8616 case insensitive password comparison Affected versions: curl 7.7 to and including 7.50.3 Reference: https://curl.haxx.se/docs/adv_20161102B.html Signed-off-by: Sona Sarmadi Signed-off-by: Armin Kuster --- meta/recipes-support/curl/curl/CVE-2016-8616.patch | 49 ++++++++++++++++++++++ meta/recipes-support/curl/curl_7.47.1.bb | 1 + 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2016-8616.patch diff --git a/meta/recipes-support/curl/curl/CVE-2016-8616.patch b/meta/recipes-support/curl/curl/CVE-2016-8616.patch new file mode 100644 index 0000000000..d5d78fc73f --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2016-8616.patch @@ -0,0 +1,49 @@ +From b3ee26c5df75d97f6895e6ec4538894ebaf76e48 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Tue, 27 Sep 2016 18:01:53 +0200 +Subject: [PATCH] connectionexists: use case sensitive user/password + comparisons + +CVE: CVE-2016-8616 +Upstream-Status: Backport + +Bug: https://curl.haxx.se/docs/adv_20161102B.html +Reported-by: Cure53 +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 09:16:20.459836564 +0100 +@@ -3305,8 +3305,8 @@ + if(!(needle->handler->flags & PROTOPT_CREDSPERREQUEST)) { + /* This protocol requires credentials per connection, + so verify that we're using the same name and password as well */ +- if(!strequal(needle->user, check->user) || +- !strequal(needle->passwd, check->passwd)) { ++ if(strcmp(needle->user, check->user) || ++ strcmp(needle->passwd, check->passwd)) { + /* one of them was different */ + continue; + } +@@ -3369,8 +3369,8 @@ + possible. (Especially we must not reuse the same connection if + partway through a handshake!) */ + if(wantNTLMhttp) { +- if(!strequal(needle->user, check->user) || +- !strequal(needle->passwd, check->passwd)) ++ if(strcmp(needle->user, check->user) || ++ strcmp(needle->passwd, check->passwd)) + continue; + } + else if(check->ntlm.state != NTLMSTATE_NONE) { +@@ -3380,8 +3380,8 @@ + + /* Same for Proxy NTLM authentication */ + if(wantProxyNTLMhttp) { +- if(!strequal(needle->proxyuser, check->proxyuser) || +- !strequal(needle->proxypasswd, check->proxypasswd)) ++ if(strcmp(needle->proxyuser, check->proxyuser) || ++ strcmp(needle->proxypasswd, check->proxypasswd)) + continue; + } + else if(check->proxyntlm.state != NTLMSTATE_NONE) { diff --git a/meta/recipes-support/curl/curl_7.47.1.bb b/meta/recipes-support/curl/curl_7.47.1.bb index 1f2758c9c5..20c3721d53 100644 --- a/meta/recipes-support/curl/curl_7.47.1.bb +++ b/meta/recipes-support/curl/curl_7.47.1.bb @@ -16,6 +16,7 @@ SRC_URI += " file://configure_ac.patch \ file://CVE-2016-5421.patch \ file://CVE-2016-7141.patch \ file://CVE-2016-8615.patch \ + file://CVE-2016-8616.patch \ " SRC_URI[md5sum] = "9ea3123449439bbd960cd25cf98796fb" -- cgit v1.2.3-54-g00ecf