From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19184 invoked by alias); 12 Nov 2018 12:43:14 -0000 Mailing-List: contact libc-stable-help@sourceware.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Subscribe: List-Archive: Sender: libc-stable-owner@sourceware.org Received: (qmail 19172 invoked by uid 89); 12 Nov 2018 12:43:14 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.100.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.0 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy=Hx-languages-length:1857 X-Spam-Status: No, score=-25.0 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: mail-qk1-f179.google.com Received: from mail-qk1-f179.google.com (HELO mail-qk1-f179.google.com) (209.85.222.179) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 12 Nov 2018 12:43:13 +0000 Received: by mail-qk1-f179.google.com with SMTP id a132so12968752qkg.1 for ; Mon, 12 Nov 2018 04:43:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:openpgp:organization:message-id :date:user-agent:mime-version:content-language; bh=2cVPTvtPJw83nph+kN9j/tjfwxNfqNWdKn5UBA3rFwI=; b=mK7jJMuvO98mQGLf/a9wCwcGIkgqutGOm9r/qBCZlFJezYG2UPeYanwED8D7CbUoos 2BOFWzgUG5yQ1GWKGqwCiz4Lu4w8NIkDMcM23hSiJYAuJMsxHwIqfhLXV9eHMK3TPSII ag8bGdmmDcNEcT3Z4RFRmvutKRJ9chy2+P8ar5Gs0idc9ATy1JQYVik9Uk0xAAd9qIaI 6YcbwZzsdXTZSPqGyiZO+KebZx+rQJ6WRtC1/tJ2uS7fNQE1aWMSglLPjfRHmnVJuqUD 6tgALEkpuJwrV9KOUsqbLchG0VKEQfbwwo/3ntlG6+CKGf6rpNasqIzeKZR1sQLznRCL zCWg== X-Gm-Message-State: AGRZ1gKKXjf0o1FjZM9kbF54VcrzCb2fDSr/MZ30H4Qk89yQN8rVmFfB 2io4PAOaRj8XiUBGT9xhoe15fQC8LK7nLw== X-Google-Smtp-Source: AJdET5crxmgedczm9bXI1Ij/IDrhTIcOqpCMritsZ8ysa73xBthwwTcJMGRxtoAii3PLzSk9RIQzfw== X-Received: by 2002:ac8:2906:: with SMTP id y6mr708022qty.42.1542026591122; Mon, 12 Nov 2018 04:43:11 -0800 (PST) Received: from [10.150.73.190] (97.sub-174-227-17.myvzw.com. [174.227.17.97]) by smtp.gmail.com with ESMTPSA id s46sm10395141qtc.63.2018.11.12.04.43.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Nov 2018 04:43:10 -0800 (PST) To: "GNU C Library (Stable)" From: Carlos O'Donell Subject: [2.28 COMMITTED] Fix tzfile low-memory assertion failure Openpgp: preference=signencrypt Organization: Red Hat Message-ID: <34733ee4-48c7-5294-8a09-61e39c1c4f70@redhat.com> Date: Mon, 01 Jan 2018 00:00:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------214EFC7FE4C498562AF254B8" Content-Language: en-US X-SW-Source: 2018-11/txt/msg00022.txt.bz2 This is a multi-part message in MIME format. --------------214EFC7FE4C498562AF254B8 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-length: 365 Tested on x86_64. build-many-glibcs run in progress. -- [BZ #21716] * time/tzfile.c (__tzfile_read): Check for memory exhaustion when registering time zone abbreviations. (cherry picked from commit e4e4fde51a309801af5eed72d3494cbf4b7737aa) --- ChangeLog | 7 +++++++ time/tzfile.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) -- Cheers, Carlos. --------------214EFC7FE4C498562AF254B8 Content-Type: text/x-patch; name="0007-Fix-tzfile-low-memory-assertion-failure.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0007-Fix-tzfile-low-memory-assertion-failure.patch" Content-length: 1485 >From e7388e5134471ef965bd48bafc71ba71eb8bf017 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 18 Sep 2018 15:02:10 -0700 Subject: [PATCH 7/8] Fix tzfile low-memory assertion failure [BZ #21716] * time/tzfile.c (__tzfile_read): Check for memory exhaustion when registering time zone abbreviations. (cherry picked from commit e4e4fde51a309801af5eed72d3494cbf4b7737aa) --- ChangeLog | 7 +++++++ time/tzfile.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5145768a45..788f3f41be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-09-18 Paul Eggert + + Fix tzfile low-memory assertion failure + [BZ #21716] + * time/tzfile.c (__tzfile_read): Check for memory exhaustion + when registering time zone abbreviations. + 2018-08-31 Paul Pluzhnikov [BZ #20271] diff --git a/time/tzfile.c b/time/tzfile.c index 2a385b92bc..ea6e940303 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -410,7 +410,8 @@ __tzfile_read (const char *file, size_t extra, char **extrap) /* First "register" all timezone names. */ for (i = 0; i < num_types; ++i) - (void) __tzstring (&zone_names[types[i].idx]); + if (__tzstring (&zone_names[types[i].idx]) == NULL) + goto ret_free_transitions; /* Find the standard and daylight time offsets used by the rule file. We choose the offsets in the types of each flavor that are -- 2.17.2 --------------214EFC7FE4C498562AF254B8--