From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by sourceware.org (Postfix) with ESMTPS id D56343858C78 for ; Fri, 12 Apr 2024 16:19:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D56343858C78 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D56343858C78 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::42d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712938781; cv=none; b=KpQa8F56dQIjC8KQAolGs5fNj8Bp0yzF6tx5fi/a/bSjxaMliz+SqmtvUqwpNT7/celkSq9rKE0X4LIkn0IGVYdKFmJJyWPQPva7WWfmBsKsUBPl9R5e+RHksoeDu4D/ORy53ak/A22THoigPopsQMWZIzSDzi1ZRCXEhYYpKwk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712938781; c=relaxed/simple; bh=H9uHgV2qz2cFVk7gPyQbiWga9/45wYOQSXVEan54mVY=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=jJjc/G5Yu4Ic0LqnMDe2cQWcJVF7scBmVyQjCkeytGrpXY2U9Oaw1wWcn47KY4zGxctoGofeM3jVbomrBy2SlXc9vsINwNjNhg+9pEfSuDkdpC3GAr52c+1ox047pAdNdY+sj4f27zqqey79cG/C2KAX7r4UYofg9oQTEiAPQZ0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-6ecf8ebff50so753220b3a.1 for ; Fri, 12 Apr 2024 09:19:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712938776; x=1713543576; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:organization:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=2TPMQeQO6h/itXHxFA6CsAN3hk95/rMbp+ypi4wMgiQ=; b=ElFWTjNuYhaaA4Mg2gPIyzX+F2erxQ2AIjZXgQx1esICqlVkqJF9HzcUa9wOd7m/vJ 7uLeZHdXOC2bVNhh0kb1oav0c+l53bQReZPzLpm5iZxrqSR7YkomFIZBVIsjK+Rx92Ed N9e2pkQcgqzFEYpaGUXMw2NzG6cijKhrIEbOFNycxndt4uaaOMLjEQuLJPGNDX7mU7R1 BwH0IgXfmKiEbPMJ5qGJsfoqDbp3m2LuwtzqZjNvOLUZfcTP77ImdS0goS288eRZ4zak Zq+OUdnfQsWoRNHc8KjS7qKZuWq03YjkqPuAuVI11Mes66HfbTBnIOHYy6keVo6Qg/+y OA4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712938776; x=1713543576; h=content-transfer-encoding:in-reply-to:organization:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2TPMQeQO6h/itXHxFA6CsAN3hk95/rMbp+ypi4wMgiQ=; b=OQlm05Jalp8k0ixmjEjHKI7Sa1A2r3PNQY9EpHfLbjjvwII/kAKyHV5gxTtaoFqz4F OcMm7isFGu44dS7XvLrQKcWPinfrpTeuPYED/mnoWN2cNF8Z0scCIB4VH9Xl0DeaOxdU Zthuua6a1riIEYRDmG6mhsvdUYpe6SWYEbJ+99J1ZLQMwveYYFyU1vlLgb2QvEKtOzaS eL0+k4g7iujnACU3VOvZmWBTt99Jdjmhn8riRB1lKWJUe81cM+T8GtGJiua3A8HZRt6e q0pK6AulrTolu75BuPzVc5XKQugOyQWNuY61/PevzEaF6lt3r+YBSNi2kMDefpBFq489 EUgQ== X-Gm-Message-State: AOJu0Yyma3unHgLuJDi4oDQ8M5SOj1RDx7BC/Uzql7Kt8C68TzIHDBKz g5R02dAGnSU3MeInamGF1A/vAMvpEio+eAfzVJgNfftbidTJ91kcIud54umTC/+XvXzWUM+lOcY / X-Google-Smtp-Source: AGHT+IHgUUJAICzHayQLVZcaTHVZixZmQipYT4JVuq47DrFY3r+8kDa2fRwSYVK8N/rljvX9gJneJg== X-Received: by 2002:a05:6a00:179d:b0:6ed:5f9e:39d7 with SMTP id s29-20020a056a00179d00b006ed5f9e39d7mr8429408pfg.5.1712938775489; Fri, 12 Apr 2024 09:19:35 -0700 (PDT) Received: from ?IPV6:2804:1b3:a7c0:d8e5:c10b:67bb:5fcf:ca20? ([2804:1b3:a7c0:d8e5:c10b:67bb:5fcf:ca20]) by smtp.gmail.com with ESMTPSA id t6-20020a056a00138600b006ecef9e9615sm3024922pfg.200.2024.04.12.09.19.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Apr 2024 09:19:35 -0700 (PDT) Message-ID: <9a348c22-e1d1-4bd0-bd0b-699d39a9d991@linaro.org> Date: Fri, 12 Apr 2024 13:19:32 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 3/3] login: Use unsigned 32-bit types for seconds-since-epoch To: libc-alpha@sourceware.org, Florian Weimer References: Content-Language: en-US From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.8 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: On 10/04/24 03:45, Florian Weimer wrote: > These fields store timestamps when the system was running. No Linux > systems existed before 1970, so these values are unused. Switching > to unsigned types allows continued use of the existing struct layouts > beyond the year 2038. > > The intent is to give distributions more time to switch to improved > interfaces that also avoid locking/data corruption issues. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > NEWS | 9 +++++++- > bits/utmp.h | 4 ++-- > login/Makefile | 4 +++- > login/tst-utmp-unsigned-64.c | 1 + > login/tst-utmp-unsigned.c | 40 ++++++++++++++++++++++++++++++++++++ > sysdeps/gnu/bits/utmpx.h | 2 +- > 6 files changed, 55 insertions(+), 5 deletions(-) > create mode 100644 login/tst-utmp-unsigned-64.c > create mode 100644 login/tst-utmp-unsigned.c > > diff --git a/NEWS b/NEWS > index da4b2223e9..cf6078cf20 100644 > --- a/NEWS > +++ b/NEWS > @@ -28,7 +28,14 @@ Major new features: > > Deprecated and removed features, and other changes affecting compatibility: > > - [Add deprecations, removals and changes affecting compatibility here] > +* Architectures which use a 32-bit seconds-since-epoch field in struct > + lastlog, struct utmp, struct utmpx (such as i386, powerpc64le, rv32, > + rv64, x86-64) switched from a signed to an unsigned type for that > + field. This allows these fields to store timestamps beyond the year > + 2038, until the year 2106. Please note that applications are still > + expected to migrate off the interfaces declared in and > + (except for login_tty) due to locking and session management > + problems. > > Changes to build and runtime requirements: > > diff --git a/bits/utmp.h b/bits/utmp.h > index f2d1c13d8c..27cb536800 100644 > --- a/bits/utmp.h > +++ b/bits/utmp.h > @@ -36,7 +36,7 @@ > struct lastlog > { > #if __WORDSIZE_TIME64_COMPAT32 > - int32_t ll_time; > + __uint32_t ll_time; > #else > __time_t ll_time; > #endif > @@ -76,7 +76,7 @@ struct utmp > int32_t ut_session; /* Session ID, used for windowing. */ > struct > { > - int32_t tv_sec; /* Seconds. */ > + __uint32_t tv_sec; /* Seconds. */ > int32_t tv_usec; /* Microseconds. */ > } ut_tv; /* Time entry was made. */ > #else > diff --git a/login/Makefile b/login/Makefile > index f91190e3dc..84563230ef 100644 > --- a/login/Makefile > +++ b/login/Makefile > @@ -44,9 +44,11 @@ subdir-dirs = programs > vpath %.c programs > > tests := tst-utmp tst-utmpx tst-grantpt tst-ptsname tst-getlogin tst-updwtmpx \ > - tst-pututxline-lockfail tst-pututxline-cache tst-utmp-size tst-utmp-size-64 > + tst-pututxline-lockfail tst-pututxline-cache tst-utmp-size tst-utmp-size-64 \ > + tst-utmp-unsigned tst-utmp-unsigned-64 > > CFLAGS-tst-utmp-size-64.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 > +CFLAGS-tst-utmp-unsigned-64.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 > > # Empty compatibility library for old binaries. > extra-libs := libutil > diff --git a/login/tst-utmp-unsigned-64.c b/login/tst-utmp-unsigned-64.c > new file mode 100644 > index 0000000000..940e7654f8 > --- /dev/null > +++ b/login/tst-utmp-unsigned-64.c > @@ -0,0 +1 @@ > +#include "tst-utmp-unsigned.c" > diff --git a/login/tst-utmp-unsigned.c b/login/tst-utmp-unsigned.c > new file mode 100644 > index 0000000000..27ad03a7d6 > --- /dev/null > +++ b/login/tst-utmp-unsigned.c > @@ -0,0 +1,40 @@ > +/* Check that struct utmp, struct utmpx, struct lastlog use unsigned epoch. > + Copyright (C) 2024 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 > + > +/* Undefined. Used to check that the conditions below are optimized away. */ > +void link_failure_utmp (void); > +void link_failure_utmpx (void); > +void link_failure_lastlog (void); > + > +static int > +do_test (void) > +{ > + if ((struct utmp) { .ut_tv = { 0x80000000U, }, }.ut_tv.tv_sec <= 0) > + link_failure_utmp (); > + if ((struct utmpx) { .ut_tv = { 0x80000000U, }, }.ut_tv.tv_sec <= 0) > + link_failure_utmpx (); > + if ((struct lastlog) { .ll_time = 0x80000000U, }.ll_time <= 0) > + link_failure_lastlog (); > + return 0; > +} > + > +#include > diff --git a/sysdeps/gnu/bits/utmpx.h b/sysdeps/gnu/bits/utmpx.h > index 34b4afbc6a..ed0df9bd81 100644 > --- a/sysdeps/gnu/bits/utmpx.h > +++ b/sysdeps/gnu/bits/utmpx.h > @@ -74,7 +74,7 @@ struct utmpx > __int32_t ut_session; /* Session ID, used for windowing. */ > struct > { > - __int32_t tv_sec; /* Seconds. */ > + __uint32_t tv_sec; /* Seconds. */ > __int32_t tv_usec; /* Microseconds. */ > } ut_tv; /* Time entry was made. */ > #else