From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) by sourceware.org (Postfix) with ESMTPS id 0B5CF3858D33 for ; Tue, 7 Feb 2023 14:09:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0B5CF3858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-1442977d77dso19126871fac.6 for ; Tue, 07 Feb 2023 06:09:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=dfPiaxQwi7liKDVatRvo+JuT3CUBisB1yNgbn/04Lv0=; b=kUULo+Emn7b8yPsN6I1YCD2DGhFajbrQInfS4uyZcT9Ha1Wv9bxIU0T1GR6YK/lwKI PssJcipZXVwqNtQnP78EdhvhbVAdOLVcHE3b2ArYHW7bmW2hhKy7vCc1849fOYsfD1Gs zZb8yRwjgTv3mJ3+oS+kbs/R/KPi4JAGvwFECNhMq6Rep60qB2AGY00NShCHniOFIw5g VQP//vXZ/xwjhSvS86yCJNGh4ZMls1BbaT+YnJhB03+Wjdww39VgZ81JdvlPeRItI9uk RiimL4/292ies6AhGOpkdgVtggYwoxy9Jo05nJt8BrAlE0ZwM0WOpofCyyFIkRQKSWeS FIjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dfPiaxQwi7liKDVatRvo+JuT3CUBisB1yNgbn/04Lv0=; b=NPlB9QJ1f3dl5/Jn7nbid3r14+aWYBnOC3qCLV9SZ6FocNscrtMmmKiu2AfBIuxXcf TD3hRntw88qzHlEEHf0qiuu2KeUpKfyYQuSCkDvcpAeUGG+MQyPGLo5O8IPRoFy55CIl p21wHlZDOVZfoaOzf5k8+AkahDl+E8pGfqtiLXJNH+BWgxP7yrEPUV1URU4vr6PzvYQx GDBMw/ycrgbKstFVxLdrjji0le+A9/kcXb+nxn6Um81zmarcXp9DVBMX1w+2iR9Jjf3y 4R9eyop5VJ1gJfZ5JeE9CpbkDQ0hyBOihy81Idzg0R5C14WwzKgEHiCK80StL1qubTTQ S5rg== X-Gm-Message-State: AO0yUKXhQjEA2YadioOFUTssnqSHydB+nisVmcPJqJx29/ydGY1uHAG0 S2B5cNgJX90/WrYKG6yYDQxA3X4tykGCFripr7A= X-Google-Smtp-Source: AK7set9+6yHhLQLXJfPFgpJfFFULdLKBzcBL/Pg2CITXi6U8merDg3NHyFSxn+cGP7LPRneNKhrJSA== X-Received: by 2002:a05:6870:1c7:b0:160:319a:d1db with SMTP id n7-20020a05687001c700b00160319ad1dbmr1808853oad.3.1675778952505; Tue, 07 Feb 2023 06:09:12 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c2:8ced:3d04:3626:cc0e:457c]) by smtp.gmail.com with ESMTPSA id g3-20020a4a7543000000b004f8cf5f45e9sm5983757oof.22.2023.02.07.06.09.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 06:09:11 -0800 (PST) From: Adhemerval Zanella To: libc-stable@sourceware.org Cc: Andreas Schwab Subject: [COMMITTED] Use 64-bit time_t interfaces in strftime and strptime (bug 30053) Date: Tue, 7 Feb 2023 11:09:07 -0300 Message-Id: <20230207140907.3901735-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Andreas Schwab Both functions use time_t only internally, so the ABI is not affected. (cherry picked from commit 41349f6f67c83e7bafe49f985b56493d2c4c9c77) --- NEWS | 2 ++ time/Makefile | 3 ++- time/strftime_l.c | 4 +++ time/strptime_l.c | 4 ++- time/tst-strftime4-time64.c | 1 + time/tst-strftime4.c | 52 +++++++++++++++++++++++++++++++++++++ 6 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 time/tst-strftime4-time64.c create mode 100644 time/tst-strftime4.c diff --git a/NEWS b/NEWS index d576862346..0da4770fd1 100644 --- a/NEWS +++ b/NEWS @@ -137,6 +137,8 @@ The following bugs are resolved with this release: [29771] Restore IPC_64 support in sysvipc *ctl functions [29776] elf/tst-tlsopt-powerpc fails when compiled with -mcpu=power10 [29951] time: Set daylight to 1 for matching DST/offset change + [30068] stdio: incorrect printf output for integers with thousands + separator and width field (CVE-2023-25139) Version 2.34 diff --git a/time/Makefile b/time/Makefile index 38e3a7f4c7..ef3bb767b8 100644 --- a/time/Makefile +++ b/time/Makefile @@ -50,7 +50,7 @@ tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \ tst-clock tst-clock2 tst-clock_nanosleep tst-cpuclock1 \ tst-adjtime tst-ctime tst-difftime tst-mktime4 tst-clock_settime \ tst-settimeofday tst-itimer tst-gmtime tst-timegm \ - tst-timespec_get tst-timespec_getres + tst-timespec_get tst-timespec_getres tst-strftime4 tests-time64 := \ tst-adjtime-time64 \ @@ -65,6 +65,7 @@ tests-time64 := \ tst-itimer-time64 \ tst-mktime4-time64 \ tst-settimeofday-time64 \ + tst-strftime4-time64 \ tst-timegm-time64 \ tst-timespec_get-time64 \ tst-timespec_getres-time64 \ diff --git a/time/strftime_l.c b/time/strftime_l.c index d8cde9c5a3..57abbaa571 100644 --- a/time/strftime_l.c +++ b/time/strftime_l.c @@ -159,6 +159,10 @@ extern char *tzname[]; #ifdef _LIBC # define tzname __tzname # define tzset __tzset + +# define time_t __time64_t +# define __gmtime_r(t, tp) __gmtime64_r (t, tp) +# define mktime(tp) __mktime64 (tp) #endif #if !HAVE_TM_GMTOFF diff --git a/time/strptime_l.c b/time/strptime_l.c index 02c5d63c79..39d1e59b08 100644 --- a/time/strptime_l.c +++ b/time/strptime_l.c @@ -30,8 +30,10 @@ #ifdef _LIBC # define HAVE_LOCALTIME_R 0 # include "../locale/localeinfo.h" -#endif +# define time_t __time64_t +# define __localtime_r(t, tp) __localtime64_r (t, tp) +#endif #if ! HAVE_LOCALTIME_R && ! defined localtime_r # ifdef _LIBC diff --git a/time/tst-strftime4-time64.c b/time/tst-strftime4-time64.c new file mode 100644 index 0000000000..4d47ee7d79 --- /dev/null +++ b/time/tst-strftime4-time64.c @@ -0,0 +1 @@ +#include "tst-strftime4.c" diff --git a/time/tst-strftime4.c b/time/tst-strftime4.c new file mode 100644 index 0000000000..659716d0fa --- /dev/null +++ b/time/tst-strftime4.c @@ -0,0 +1,52 @@ +/* Test strftime and strptime after 2038-01-19 03:14:07 UTC (bug 30053). + Copyright (C) 2023 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include + +static int +do_test (void) +{ + TEST_VERIFY_EXIT (setenv ("TZ", "UTC0", 1) == 0); + tzset (); + if (sizeof (time_t) > 4) + { + time_t wrap = (time_t) 2147483648LL; + char buf[80]; + struct tm *tm = gmtime (&wrap); + TEST_VERIFY_EXIT (tm != NULL); + TEST_VERIFY_EXIT (strftime (buf, sizeof buf, "%s", tm) > 0); + puts (buf); + TEST_VERIFY (strcmp (buf, "2147483648") == 0); + + struct tm tm2; + char *p = strptime (buf, "%s", &tm2); + TEST_VERIFY_EXIT (p != NULL && *p == '\0'); + time_t t = mktime (&tm2); + printf ("%lld\n", (long long) t); + TEST_VERIFY (t == wrap); + } + else + FAIL_UNSUPPORTED ("32-bit time_t"); + return 0; +} + +#include -- 2.34.1