From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id 7BA663858D38 for ; Fri, 12 Apr 2024 16:14:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7BA663858D38 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 7BA663858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::42a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712938486; cv=none; b=vdhJRqm4/ho/4lbv8ZA1nqzlQhVhub7EYkRieGeyLXtXgyt0GJc7qTMbkTpUuJHzst2bieB4VyTdzF5tQ+d1hHwP+Zcmka0n1dbqV5y8gOfJeAvz7qtPoRfCALEIlwYLTU7J24ZpmjL0HX3SvxLhvjdV1cXqjE8rIqJpDdAyxnk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712938486; c=relaxed/simple; bh=1gUT5DUyzJaFc2FHhZaUkVnFdYIJfrChW1tipn03UiI=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=rQdP+tfxsrqkhQhPE40czEskBrPUDVKC4nVsB/PROZp7SYKpe5/RdrQItnhHU0O1s5FxWxWe70l8A5BMNW2xbGrfXyLYG/201etdYwUfN/2LYbY7RdrqQSCdXxHC/9bACH0wE2S0rxn3FHo4A0YI9dFepLLrxW1RFVVNvtgk62s= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-6ed691fb83eso947950b3a.1 for ; Fri, 12 Apr 2024 09:14:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712938482; x=1713543282; 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=EKskouqlEQMZbK3/+G6a2uMXdiWKq0kA/OmE3g/K3k8=; b=RDJcDX+/Rj4Uc7k1DX/quMRAFQti0T+68Z7W/l0IPL0WBsYmiuCvDTQPxfO/u+j9EB VORbSiWqz/7kejx8c0qDBnlY4RsREFm1XHYo6pzkDUzxijuvbObsRXrmrofprvtS8dwX 5/PXsQssDeMX+N/p1wxLhAfI1V1NEqxi4ujPpfESEFoRhT0whc//fawNHBNBIvua9ALX gz0R2LuGT0/jEPU4mMKqtr4PUTXjLMghD5xXFEgySx1RlKDmp3YTRdXfjsgVTSdDq1rQ cW9EcxhRwe0+LMhWOKkYw+Rv0XDN1aUJg5fbxCcJEzb3b39vmOjpr9TgOsBWlaX/Ekpw IKYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712938482; x=1713543282; 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=EKskouqlEQMZbK3/+G6a2uMXdiWKq0kA/OmE3g/K3k8=; b=ZmFNKi6SheCh3fHd+s7WWvzxl0vAEVil6q9UeOeOtZxy+1jg45vQDFvd/b0Kj6m8lQ 8GdXH9Sa8ON1rNBndHgUPBawQfPSkPN7i9a7INgWRyePeTJEqhoWDlk7+p0Iemj3ZjbX 3MUj9/d4nddERCgdZoVWloXrAVBafSxeDIQ5llhthbdgKqobJT+LP8FRfC5Pw9Hz+zyQ l2RFOkLYW3n8NZjTLCoKQLlon2JIuFzb+oExVQsKun8NpaUl1Y0m368q4OlyrBZ3Rd6G EeF2BccgCZAS1SKzNdblgl6EDJDvuAjNTuqxPpDm/UgIcTDCVrbFwEFQ54veAn7jRSwr YD8Q== X-Gm-Message-State: AOJu0YwIifSW+Vl1X7V7cZ9g563rutzKdGTpzWjLHokdfjuOjEwqfhhs liTsWXDsxQqvhsyLOAKN6T5mav8FEjN2bqN2uZDpUXrNcKfsL/RAljs/yD/RdBI+U2eD3HsUwH0 L X-Google-Smtp-Source: AGHT+IFQCchssHUrVp1RfGaDEKG0H1gU8govKfrDNrL/iFydR1n39j06psPlkF15W+7Jq206gI9sbw== X-Received: by 2002:a05:6a00:2314:b0:6e5:43b5:953b with SMTP id h20-20020a056a00231400b006e543b5953bmr3744829pfh.14.1712938481717; Fri, 12 Apr 2024 09:14:41 -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 bz25-20020a056a02061900b005f3d2a9a91bsm2542003pgb.89.2024.04.12.09.14.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Apr 2024 09:14:40 -0700 (PDT) Message-ID: Date: Fri, 12 Apr 2024 13:14:38 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 1/3] login: Check default sizes of structs utmp, utmpx, lastlog To: libc-alpha@sourceware.org, Florian Weimer References: <30fd9d14d3006367e02a65027a0b41cdf0ea62ae.1712731247.git.fweimer@redhat.com> Content-Language: en-US From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: <30fd9d14d3006367e02a65027a0b41cdf0ea62ae.1712731247.git.fweimer@redhat.com> 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: > The default is for ports with a 64-bit time_t. > Ports with a 32-bit time_t or with __WORDSIZE_TIME64_COMPAT32=1 > need to override it. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > login/Makefile | 2 +- > login/tst-utmp-size.c | 33 +++++++++++++++++++++++++++++++++ > sysdeps/arc/utmp-size.h | 3 +++ > sysdeps/arm/utmp-size.h | 2 ++ > sysdeps/csky/utmp-size.h | 2 ++ > sysdeps/generic/utmp-size.h | 23 +++++++++++++++++++++++ > sysdeps/hppa/utmp-size.h | 2 ++ > sysdeps/m68k/utmp-size.h | 3 +++ > sysdeps/microblaze/utmp-size.h | 2 ++ > sysdeps/mips/utmp-size.h | 2 ++ > sysdeps/nios2/utmp-size.h | 2 ++ > sysdeps/or1k/utmp-size.h | 3 +++ > sysdeps/powerpc/utmp-size.h | 2 ++ > sysdeps/riscv/utmp-size.h | 2 ++ > sysdeps/sh/utmp-size.h | 2 ++ > sysdeps/sparc/utmp-size.h | 2 ++ > sysdeps/x86/utmp-size.h | 2 ++ > 17 files changed, 88 insertions(+), 1 deletion(-) > create mode 100644 login/tst-utmp-size.c > create mode 100644 sysdeps/arc/utmp-size.h > create mode 100644 sysdeps/arm/utmp-size.h > create mode 100644 sysdeps/csky/utmp-size.h > create mode 100644 sysdeps/generic/utmp-size.h > create mode 100644 sysdeps/hppa/utmp-size.h > create mode 100644 sysdeps/m68k/utmp-size.h > create mode 100644 sysdeps/microblaze/utmp-size.h > create mode 100644 sysdeps/mips/utmp-size.h > create mode 100644 sysdeps/nios2/utmp-size.h > create mode 100644 sysdeps/or1k/utmp-size.h > create mode 100644 sysdeps/powerpc/utmp-size.h > create mode 100644 sysdeps/riscv/utmp-size.h > create mode 100644 sysdeps/sh/utmp-size.h > create mode 100644 sysdeps/sparc/utmp-size.h > create mode 100644 sysdeps/x86/utmp-size.h > > diff --git a/login/Makefile b/login/Makefile > index 1e22008a61..b26ac42bfc 100644 > --- a/login/Makefile > +++ b/login/Makefile > @@ -44,7 +44,7 @@ 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-pututxline-lockfail tst-pututxline-cache tst-utmp-size > > # Empty compatibility library for old binaries. > extra-libs := libutil > diff --git a/login/tst-utmp-size.c b/login/tst-utmp-size.c > new file mode 100644 > index 0000000000..1b7f7ff042 > --- /dev/null > +++ b/login/tst-utmp-size.c > @@ -0,0 +1,33 @@ > +/* Check expected sizes of struct utmp, struct utmpx, struct lastlog. > + 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 > + > +static int > +do_test (void) > +{ > + _Static_assert (sizeof (struct utmp) == UTMP_SIZE, "struct utmp size"); > + _Static_assert (sizeof (struct utmpx) == UTMP_SIZE, "struct utmpx size"); > + _Static_assert (sizeof (struct lastlog) == LASTLOG_SIZE, > + "struct lastlog size"); > + return 0; > +} > + > +#include > diff --git a/sysdeps/arc/utmp-size.h b/sysdeps/arc/utmp-size.h > new file mode 100644 > index 0000000000..a247fcd3da > --- /dev/null > +++ b/sysdeps/arc/utmp-size.h > @@ -0,0 +1,3 @@ > +/* arc has less padding than other architectures with 64-bit time_t. */ > +#define UTMP_SIZE 392 > +#define LASTLOG_SIZE 296 > diff --git a/sysdeps/arm/utmp-size.h b/sysdeps/arm/utmp-size.h > new file mode 100644 > index 0000000000..8f21ebe1b6 > --- /dev/null > +++ b/sysdeps/arm/utmp-size.h > @@ -0,0 +1,2 @@ > +#define UTMP_SIZE 384 > +#define LASTLOG_SIZE 292 > diff --git a/sysdeps/csky/utmp-size.h b/sysdeps/csky/utmp-size.h > new file mode 100644 > index 0000000000..8f21ebe1b6 > --- /dev/null > +++ b/sysdeps/csky/utmp-size.h > @@ -0,0 +1,2 @@ > +#define UTMP_SIZE 384 > +#define LASTLOG_SIZE 292 > diff --git a/sysdeps/generic/utmp-size.h b/sysdeps/generic/utmp-size.h > new file mode 100644 > index 0000000000..89dbe878b0 > --- /dev/null > +++ b/sysdeps/generic/utmp-size.h > @@ -0,0 +1,23 @@ > +/* Expected sizes of utmp-related structures stored in files. 64-bit version. > + 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 > + . */ > + > +/* Expected size, in bytes, of struct utmp and struct utmpx. */ > +#define UTMP_SIZE 400 > + > +/* Expected size, in bytes, of struct lastlog. */ > +#define LASTLOG_SIZE 296 > diff --git a/sysdeps/hppa/utmp-size.h b/sysdeps/hppa/utmp-size.h > new file mode 100644 > index 0000000000..8f21ebe1b6 > --- /dev/null > +++ b/sysdeps/hppa/utmp-size.h > @@ -0,0 +1,2 @@ > +#define UTMP_SIZE 384 > +#define LASTLOG_SIZE 292 > diff --git a/sysdeps/m68k/utmp-size.h b/sysdeps/m68k/utmp-size.h > new file mode 100644 > index 0000000000..5946685819 > --- /dev/null > +++ b/sysdeps/m68k/utmp-size.h > @@ -0,0 +1,3 @@ > +/* m68k has 2-byte alignment. */ > +#define UTMP_SIZE 382 > +#define LASTLOG_SIZE 292 > diff --git a/sysdeps/microblaze/utmp-size.h b/sysdeps/microblaze/utmp-size.h > new file mode 100644 > index 0000000000..8f21ebe1b6 > --- /dev/null > +++ b/sysdeps/microblaze/utmp-size.h > @@ -0,0 +1,2 @@ > +#define UTMP_SIZE 384 > +#define LASTLOG_SIZE 292 > diff --git a/sysdeps/mips/utmp-size.h b/sysdeps/mips/utmp-size.h > new file mode 100644 > index 0000000000..8f21ebe1b6 > --- /dev/null > +++ b/sysdeps/mips/utmp-size.h > @@ -0,0 +1,2 @@ > +#define UTMP_SIZE 384 > +#define LASTLOG_SIZE 292 > diff --git a/sysdeps/nios2/utmp-size.h b/sysdeps/nios2/utmp-size.h > new file mode 100644 > index 0000000000..8f21ebe1b6 > --- /dev/null > +++ b/sysdeps/nios2/utmp-size.h > @@ -0,0 +1,2 @@ > +#define UTMP_SIZE 384 > +#define LASTLOG_SIZE 292 > diff --git a/sysdeps/or1k/utmp-size.h b/sysdeps/or1k/utmp-size.h > new file mode 100644 > index 0000000000..6b3653aa4d > --- /dev/null > +++ b/sysdeps/or1k/utmp-size.h > @@ -0,0 +1,3 @@ > +/* or1k has less padding than other architectures with 64-bit time_t. */ > +#define UTMP_SIZE 392 > +#define LASTLOG_SIZE 296 > diff --git a/sysdeps/powerpc/utmp-size.h b/sysdeps/powerpc/utmp-size.h > new file mode 100644 > index 0000000000..8f21ebe1b6 > --- /dev/null > +++ b/sysdeps/powerpc/utmp-size.h > @@ -0,0 +1,2 @@ > +#define UTMP_SIZE 384 > +#define LASTLOG_SIZE 292 > diff --git a/sysdeps/riscv/utmp-size.h b/sysdeps/riscv/utmp-size.h > new file mode 100644 > index 0000000000..8f21ebe1b6 > --- /dev/null > +++ b/sysdeps/riscv/utmp-size.h > @@ -0,0 +1,2 @@ > +#define UTMP_SIZE 384 > +#define LASTLOG_SIZE 292 > diff --git a/sysdeps/sh/utmp-size.h b/sysdeps/sh/utmp-size.h > new file mode 100644 > index 0000000000..8f21ebe1b6 > --- /dev/null > +++ b/sysdeps/sh/utmp-size.h > @@ -0,0 +1,2 @@ > +#define UTMP_SIZE 384 > +#define LASTLOG_SIZE 292 > diff --git a/sysdeps/sparc/utmp-size.h b/sysdeps/sparc/utmp-size.h > new file mode 100644 > index 0000000000..8f21ebe1b6 > --- /dev/null > +++ b/sysdeps/sparc/utmp-size.h > @@ -0,0 +1,2 @@ > +#define UTMP_SIZE 384 > +#define LASTLOG_SIZE 292 > diff --git a/sysdeps/x86/utmp-size.h b/sysdeps/x86/utmp-size.h > new file mode 100644 > index 0000000000..8f21ebe1b6 > --- /dev/null > +++ b/sysdeps/x86/utmp-size.h > @@ -0,0 +1,2 @@ > +#define UTMP_SIZE 384 > +#define LASTLOG_SIZE 292