From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out11.electric.net (smtp-out11.electric.net [185.38.181.46]) by mail.openembedded.org (Postfix) with ESMTP id 3ECDC719CF for ; Tue, 15 Nov 2016 09:08:23 +0000 (UTC) Received: from 1c6Zj5-0001kA-Vx by out11c.electric.net with emc1-ok (Exim 4.87) (envelope-from ) id 1c6Zj6-0001lB-Ue for openembedded-core@lists.openembedded.org; Tue, 15 Nov 2016 01:08:24 -0800 Received: by emcmailer; Tue, 15 Nov 2016 01:08:24 -0800 Received: from [192.36.1.72] (helo=mx-3.enea.com) by out11c.electric.net with esmtps (TLSv1:AES128-SHA:128) (Exim 4.87) (envelope-from ) id 1c6Zj5-0001kA-Vx for openembedded-core@lists.openembedded.org; Tue, 15 Nov 2016 01:08:23 -0800 Received: from sestofb11.enea.se (172.21.3.152) by smtp.enea.com (172.21.1.208) with Microsoft SMTP Server id 14.3.294.0; Tue, 15 Nov 2016 10:08:23 +0100 From: Sona Sarmadi To: Date: Tue, 15 Nov 2016 10:08:13 +0100 Message-ID: <1479200900-39007-4-git-send-email-sona.sarmadi@enea.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1479200900-39007-1-git-send-email-sona.sarmadi@enea.com> References: <1479200900-39007-1-git-send-email-sona.sarmadi@enea.com> MIME-Version: 1.0 Received-SPF: None (SESTOEX08.enea.se: sona.sarmadi@enea.com does not designate permitted sender hosts) X-Outbound-IP: 192.36.1.72 X-Env-From: sona.sarmadi@enea.com X-Proto: esmtps X-Revdns: mx-3.enea.com X-HELO: mx-3.enea.com X-TLS: TLSv1:AES128-SHA:128 X-Authenticated_ID: X-PolicySMART: 6551647 X-Virus-Status: Scanned by VirusSMART (c) X-Virus-Status: Scanned by VirusSMART (s) Cc: sona@enea.se Subject: [PATCHv5][krogoth 04/11] curl: CVE-2016-8618 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Nov 2016 09:08:24 -0000 Content-Type: text/plain double-free in curl_maprintf Affected versions: curl 7.1 to and including 7.50.3 Reference: https://curl.haxx.se/docs/adv_20161102D.html Signed-off-by: Sona Sarmadi --- meta/recipes-support/curl/curl/CVE-2016-8618.patch | 52 ++++++++++++++++++++++ meta/recipes-support/curl/curl_7.47.1.bb | 1 + 2 files changed, 53 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2016-8618.patch diff --git a/meta/recipes-support/curl/curl/CVE-2016-8618.patch b/meta/recipes-support/curl/curl/CVE-2016-8618.patch new file mode 100644 index 0000000..2fd4749 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2016-8618.patch @@ -0,0 +1,52 @@ +From 31106a073882656a2a5ab56c4ce2847e9a334c3c Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Wed, 28 Sep 2016 10:15:34 +0200 +Subject: [PATCH] aprintf: detect wrap-around when growing allocation + +On 32bit systems we could otherwise wrap around after 2GB and allocate 0 +bytes and crash. + +CVE: CVE-2016-8618 +Upstream-Status: Backport + +Bug: https://curl.haxx.se/docs/adv_20161102D.html +Reported-by: Cure53 +Signed-off-by: Sona Sarmadi +--- + lib/mprintf.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/lib/mprintf.c b/lib/mprintf.c +index dbedeaa..2c88aa8 100644 +--- a/lib/mprintf.c ++++ b/lib/mprintf.c +@@ -1034,20 +1034,23 @@ static int alloc_addbyter(int output, FILE *data) + } + infop->alloc = 32; + infop->len =0; + } + else if(infop->len+1 >= infop->alloc) { +- char *newptr; ++ char *newptr = NULL; ++ size_t newsize = infop->alloc*2; + +- newptr = realloc(infop->buffer, infop->alloc*2); ++ /* detect wrap-around or other overflow problems */ ++ if(newsize > infop->alloc) ++ newptr = realloc(infop->buffer, newsize); + + if(!newptr) { + infop->fail = 1; + return -1; /* fail */ + } + infop->buffer = newptr; +- infop->alloc *= 2; ++ infop->alloc = newsize; + } + + infop->buffer[ infop->len ] = outc; + + infop->len++; +-- +2.9.3 + diff --git a/meta/recipes-support/curl/curl_7.47.1.bb b/meta/recipes-support/curl/curl_7.47.1.bb index 3724411..27a999e 100644 --- a/meta/recipes-support/curl/curl_7.47.1.bb +++ b/meta/recipes-support/curl/curl_7.47.1.bb @@ -18,6 +18,7 @@ SRC_URI += " file://configure_ac.patch \ file://CVE-2016-8615.patch \ file://CVE-2016-8616.patch \ file://CVE-2016-8617.patch \ + file://CVE-2016-8618.patch \ " SRC_URI[md5sum] = "9ea3123449439bbd960cd25cf98796fb" -- 1.9.1