login: Add nonstring attributes to struct utmp, 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.  In struct utmp, the nonstring
attribute for ut_id was missing.

(cherry picked from commit c2adefbafcdd2519ff43eca6891c77cd7b29ab62)

diff --git a/ChangeLog b/ChangeLog
index becd26f7d2eba9291f9e068f9020abfb473bce48..bc2f4aae69dc25d17214c5c3205fe3b25b0ab701 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2019-08-15  Florian Weimer  <fweimer@redhat.com>
+
+       [BZ #24899]
+       * sysdeps/gnu/bits/utmpx.h (struct utmpx): Add
+       __attribute_nonstring__ to ut_line, ut_id, ut_user, ut_host.
+       * sysdeps/unix/sysv/linux/s390/bits/utmpx.h (struct utmpx):
+       Likewise.
+       * sysdeps/gnu/bits/utmp.h (struct utmp): Add
+       __attribute_nonstring__ to ut_id.
+       * sysdeps/unix/sysv/linux/s390/bits/utmpx.h (struct utmp):
+       Likewise.
+
 2019-08-28  Florian Weimer  <fweimer@redhat.com>
 
        [BZ #24902]

diff --git a/NEWS b/NEWS
index b0ab63a83b84a16b9a883da1fc4b79c017ad3452..ae6c8155157bee50649a231f795aa414010200b2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,7 @@ The following bugs are resolved with this release:
   [24880] login: Use struct flock64 in utmp
   [24986] alpha: new getegid, geteuid and getppid syscalls used
     unconditionally
+  [24899] login: Add nonstring attributes to struct utmp, struct utmpx
   [24902] login: pututxline could fail to overwrite existing entries
   [25189] Don't use a custom wrapper macro around __has_include
   [25203] libio: Disable vtable validation for pre-2.1 interposed handles

diff --git a/bits/utmp.h b/bits/utmp.h
index 3c02dd4f3fe4e99bad0f84bb84377ffdd8934929..854b342164b785e06aa72d0b8775f6fd0bf5b2a8 100644 (file)
--- a/bits/utmp.h
+++ b/bits/utmp.h
@@ -61,7 +61,8 @@ struct utmp
   pid_t ut_pid;                        /* Process ID of login process.  */
   char ut_line[UT_LINESIZE]
     __attribute_nonstring__;   /* Devicename.  */
-  char ut_id[4];               /* Inittab ID.  */
+  char ut_id[4]
+    __attribute_nonstring__;   /* Inittab ID.  */
   char ut_user[UT_NAMESIZE]
     __attribute_nonstring__;   /* Username.  */
   char ut_host[UT_HOSTSIZE]

diff --git a/sysdeps/gnu/bits/utmpx.h b/sysdeps/gnu/bits/utmpx.h
index 472a7d57d3f99eb35cae99d58faa31745bf74812..2beadbf58707e587d980c68225851322ea6404da 100644 (file)
--- a/sysdeps/gnu/bits/utmpx.h
+++ b/sysdeps/gnu/bits/utmpx.h
@@ -56,10 +56,14 @@ 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_id[4];               /* Inittab ID. */
-  char ut_user[__UT_NAMESIZE]; /* Username.  */
-  char ut_host[__UT_HOSTSIZE]; /* Hostname for remote login.  */
+  char ut_line[__UT_LINESIZE]
+    __attribute_nonstring__;   /* Devicename.  */
+  char ut_id[4]
+    __attribute_nonstring__;   /* Inittab ID.  */
+  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/utmp.h b/sysdeps/unix/sysv/linux/s390/bits/utmp.h
index 862115c6f88870a2698b3e3d717194afe3010525..0569c3b784b8de6be04e668c7e01e0e522d408cc 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/bits/utmp.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/utmp.h
@@ -61,7 +61,8 @@ struct utmp
   pid_t ut_pid;                        /* Process ID of login process.  */
   char ut_line[UT_LINESIZE]
      __attribute_nonstring__;  /* Devicename.  */
-  char ut_id[4];               /* Inittab ID.  */
+  char ut_id[4]
+    __attribute_nonstring__;   /* Inittab ID.  */
   char ut_user[UT_NAMESIZE]
      __attribute_nonstring__;  /* Username.  */
   char ut_host[UT_HOSTSIZE]

diff --git a/sysdeps/unix/sysv/linux/s390/bits/utmpx.h b/sysdeps/unix/sysv/linux/s390/bits/utmpx.h
index ea3e860a2d28aad0da099b73cd1e2470523e0556..737d9dca054aa832c76968e4bb2dc651111c2b57 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/bits/utmpx.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/utmpx.h
@@ -56,10 +56,14 @@ 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_id[4];               /* Inittab ID. */
-  char ut_user[__UT_NAMESIZE]; /* Username.  */
-  char ut_host[__UT_HOSTSIZE]; /* Hostname for remote login.  */
+  char ut_line[__UT_LINESIZE]
+    __attribute_nonstring__;   /* Devicename.  */
+  char ut_id[4]
+    __attribute_nonstring__;   /* Inittab ID.  */
+  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.  */