AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-07 10:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

login: Add nonstring attributes to struct utmp, struct utmpx [BZ #24899]

Browse Source 
Commit 7532837d7b ("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 c2adefbafc)
This commit is contained in:
Florian Weimer 2019-08-15 16:09:43 +02:00
parent 143cea84a0
commit 85da102c52
6 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -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> 2019-08-28 Florian Weimer <fweimer@redhat.com>
[BZ #24902] [BZ #24902]

1
NEWS
View File

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

3
bits/utmp.h
View File

@ -61,7 +61,8 @@ struct utmp
pid_t ut_pid; /* Process ID of login process. */ pid_t ut_pid; /* Process ID of login process. */
char ut_line[UT_LINESIZE] char ut_line[UT_LINESIZE]
__attribute_nonstring__; /* Devicename. */ __attribute_nonstring__; /* Devicename. */
char ut_id[4]; /* Inittab ID. */ char ut_id[4]
__attribute_nonstring__; /* Inittab ID. */
char ut_user[UT_NAMESIZE] char ut_user[UT_NAMESIZE]
__attribute_nonstring__; /* Username. */ __attribute_nonstring__; /* Username. */
char ut_host[UT_HOSTSIZE] char ut_host[UT_HOSTSIZE]

12
sysdeps/gnu/bits/utmpx.h
View File

@ -56,10 +56,14 @@ struct utmpx
{ {
short int ut_type; /* Type of login. */ short int ut_type; /* Type of login. */
__pid_t ut_pid; /* Process ID of login process. */ __pid_t ut_pid; /* Process ID of login process. */
char ut_line[__UT_LINESIZE]; /* Devicename. */ char ut_line[__UT_LINESIZE]
char ut_id[4]; /* Inittab ID. */ __attribute_nonstring__; /* Devicename. */
char ut_user[__UT_NAMESIZE]; /* Username. */ char ut_id[4]
char ut_host[__UT_HOSTSIZE]; /* Hostname for remote login. */ __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 struct __exit_status ut_exit; /* Exit status of a process marked
as DEAD_PROCESS. */ as DEAD_PROCESS. */

3
sysdeps/unix/sysv/linux/s390/bits/utmp.h
View File

@ -61,7 +61,8 @@ struct utmp
pid_t ut_pid; /* Process ID of login process. */ pid_t ut_pid; /* Process ID of login process. */
char ut_line[UT_LINESIZE] char ut_line[UT_LINESIZE]
__attribute_nonstring__; /* Devicename. */ __attribute_nonstring__; /* Devicename. */
char ut_id[4]; /* Inittab ID. */ char ut_id[4]
__attribute_nonstring__; /* Inittab ID. */
char ut_user[UT_NAMESIZE] char ut_user[UT_NAMESIZE]
__attribute_nonstring__; /* Username. */ __attribute_nonstring__; /* Username. */
char ut_host[UT_HOSTSIZE] char ut_host[UT_HOSTSIZE]

12
sysdeps/unix/sysv/linux/s390/bits/utmpx.h
View File

@ -56,10 +56,14 @@ struct utmpx
{ {
short int ut_type; /* Type of login. */ short int ut_type; /* Type of login. */
__pid_t ut_pid; /* Process ID of login process. */ __pid_t ut_pid; /* Process ID of login process. */
char ut_line[__UT_LINESIZE]; /* Devicename. */ char ut_line[__UT_LINESIZE]
char ut_id[4]; /* Inittab ID. */ __attribute_nonstring__; /* Devicename. */
char ut_user[__UT_NAMESIZE]; /* Username. */ char ut_id[4]
char ut_host[__UT_HOSTSIZE]; /* Hostname for remote login. */ __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 struct __exit_status ut_exit; /* Exit status of a process marked
as DEAD_PROCESS. */ as DEAD_PROCESS. */