From: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org, Florian Weimer <fweimer@redhat.com>
Subject: Re: [PATCH v3 3/3] login: Use unsigned 32-bit types for seconds-since-epoch
Date: Fri, 12 Apr 2024 13:19:32 -0300 [thread overview]
Message-ID: <9a348c22-e1d1-4bd0-bd0b-699d39a9d991@linaro.org> (raw)
In-Reply-To: <dcd1cb663536fbcdbb9597060045500a027053ca.1712731247.git.fweimer@redhat.com>
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 <adhemerval.zanella@linaro.org>
> ---
> 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 <utmp.h> and
> + <utmpx.h> (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
> + <https://www.gnu.org/licenses/>. */
> +
> +#include <utmp.h>
> +#include <utmpx.h>
> +#include <utmp-size.h>
> +
> +/* 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 <support/test-driver.c>
> 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
prev parent reply other threads:[~2024-04-12 16:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-10 6:45 [PATCH v3 0/3] " Florian Weimer
2024-04-10 6:45 ` [PATCH v3 1/3] login: Check default sizes of structs utmp, utmpx, lastlog Florian Weimer
2024-04-12 16:14 ` Adhemerval Zanella Netto
2024-04-10 6:45 ` [PATCH v3 2/3] login: structs utmp, utmpx, lastlog _TIME_BITS independence (bug 30701) Florian Weimer
2024-04-12 16:15 ` Adhemerval Zanella Netto
2024-04-12 21:23 ` Paul Eggert
2024-04-15 9:28 ` Florian Weimer
2024-04-17 21:14 ` Paul Eggert
2024-04-10 6:45 ` [PATCH v3 3/3] login: Use unsigned 32-bit types for seconds-since-epoch Florian Weimer
2024-04-12 16:19 ` Adhemerval Zanella Netto [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9a348c22-e1d1-4bd0-bd0b-699d39a9d991@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).