From patchwork Tue Aug 13 11:16:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 34069 Received: (qmail 70344 invoked by alias); 13 Aug 2019 11:16:15 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 70335 invoked by uid 89); 13 Aug 2019 11:16:15 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mx1.redhat.com From: Florian Weimer To: libc-alpha@sourceware.org Cc: Martin Sebor Subject: Re: [PATCH] login: Add nonstring attributes to struct utmpx [BZ #24899] References: <87sgq6o5oq.fsf@oldenburg2.str.redhat.com> Date: Tue, 13 Aug 2019 13:16:11 +0200 In-Reply-To: <87sgq6o5oq.fsf@oldenburg2.str.redhat.com> (Florian Weimer's message of "Mon, 12 Aug 2019 15:48:37 +0200") Message-ID: <87mugdjoxw.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 * Florian Weimer: > Commit 7532837d7b03b3ca5b9a63d77a5bd81dd23f3d9c ("The > -Wstringop-truncation option new in GCC 8 detects common misuses") > added __attribute_nonstring__ to bits/utmp.h, but it did not update > the parallel bits/utmpx.h header. > > 2019-08-12 Florian Weimer > > [BZ #24899] > * sysdeps/gnu/bits/utmpx.h (struct utmpx): Add > __attribute_nonstring__ to ut_line, ut_user, ut_host. I forgot to update the s390 header. The patch below fixes this. Thanks, Florian login: Add nonstring attributes to struct utmpx [BZ #24899] Commit 7532837d7b03b3ca5b9a63d77a5bd81dd23f3d9c ("The -Wstringop-truncation option new in GCC 8 detects common misuses") added __attribute_nonstring__ to bits/utmp.h, but it did not update the parallel bits/utmpx.h header. 2019-08-13 Florian Weimer [BZ #24899] * sysdeps/gnu/bits/utmpx.h (struct utmpx): Add __attribute_nonstring__ to ut_line, ut_user, ut_host. * sysdeps/unix/sysv/linux/s390/bits/utmpx.h (struct utmpx): Likewise. Reviewed-by: Adhemerval Zanella diff --git a/sysdeps/gnu/bits/utmpx.h b/sysdeps/gnu/bits/utmpx.h index 472a7d57d3..36259dbae1 100644 --- a/sysdeps/gnu/bits/utmpx.h +++ b/sysdeps/gnu/bits/utmpx.h @@ -56,10 +56,13 @@ struct utmpx { short int ut_type; /* Type of login. */ __pid_t ut_pid; /* Process ID of login process. */ - char ut_line[__UT_LINESIZE]; /* Devicename. */ + char ut_line[__UT_LINESIZE] + __attribute_nonstring__; /* Devicename. */ char ut_id[4]; /* Inittab ID. */ - char ut_user[__UT_NAMESIZE]; /* Username. */ - char ut_host[__UT_HOSTSIZE]; /* Hostname for remote login. */ + char ut_user[__UT_NAMESIZE] + __attribute_nonstring__; /* Username. */ + char ut_host[__UT_HOSTSIZE] + __attribute_nonstring__; /* Hostname for remote login. */ struct __exit_status ut_exit; /* Exit status of a process marked as DEAD_PROCESS. */ diff --git a/sysdeps/unix/sysv/linux/s390/bits/utmpx.h b/sysdeps/unix/sysv/linux/s390/bits/utmpx.h index ea3e860a2d..dab099994a 100644 --- a/sysdeps/unix/sysv/linux/s390/bits/utmpx.h +++ b/sysdeps/unix/sysv/linux/s390/bits/utmpx.h @@ -56,10 +56,13 @@ struct utmpx { short int ut_type; /* Type of login. */ __pid_t ut_pid; /* Process ID of login process. */ - char ut_line[__UT_LINESIZE]; /* Devicename. */ + char ut_line[__UT_LINESIZE] + __attribute_nonstring__; /* Devicename. */ char ut_id[4]; /* Inittab ID. */ - char ut_user[__UT_NAMESIZE]; /* Username. */ - char ut_host[__UT_HOSTSIZE]; /* Hostname for remote login. */ + char ut_user[__UT_NAMESIZE] + __attribute_nonstring__; /* Username. */ + char ut_host[__UT_HOSTSIZE] + __attribute_nonstring__; /* Hostname for remote login. */ struct __exit_status ut_exit; /* Exit status of a process marked as DEAD_PROCESS. */