AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-23 13:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BZ #20271] Add newlines in __libc_fatal calls.

Browse Source 
(cherry picked from commit a6e8926f8d)
This commit is contained in:
Paul Pluzhnikov 2018-08-31 18:04:32 -07:00 committed by Carlos O'Donell
parent 7d174f5353
commit 9071be6b3f
18 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ChangeLog
View File

@ -1,3 +1,25 @@
2018-08-31 Paul Pluzhnikov <ppluzhnikov@google.com>
[BZ #20271]
* include/stdio.h (__libc_fatal): Mention newline in comment.
* grp/initgroups.c (internal_getgrouplist): Add missing newline.
* nptl/pthread_cond_wait.c (__pthread_cond_wait_common): Likewise.
* nscd/initgrcache.c (addinitgroupsX): Likewise.
* nss/nsswitch.c (__nss_next2): Likewise.
* sysdeps/aarch64/dl-irel.h (elf_irela): Likewise.
* sysdeps/arm/dl-irel.h (elf_irel): Likewise.
* sysdeps/generic/unwind-dw2.c (execute_cfa_program): Likewise.
* sysdeps/i386/dl-irel.h (elf_irel): Likewise.
* sysdeps/powerpc/powerpc32/dl-irel.h (elf_irel): Likewise.
* sysdeps/powerpc/powerpc64/dl-irel.h (elf_irel): Likewise.
* sysdeps/s390/dl-irel.h (elf_irel): Likewise.
* sysdeps/sparc/sparc32/dl-irel.h (elf_irel): Likewise.
* sysdeps/sparc/sparc64/dl-irel.h (elf_irel): Likewise.
* sysdeps/x86_64/dl-irel.h (elf_irel): Likewise.
* sysdeps/nptl/futex-internal.h (futex_wake): Likewise.
* sysdeps/unix/sysv/linux/netlink_assert_response.c
(__netlink_assert_response): Likewise.
2018-08-28 Florian Weimer <fweimer@redhat.com> 2018-08-28 Florian Weimer <fweimer@redhat.com>
[BZ #23520] [BZ #23520]

2
grp/initgroups.c
View File

@ -128,7 +128,7 @@ internal_getgrouplist (const char *user, gid_t group, long int *size,
/* This is really only for debugging. */ /* This is really only for debugging. */
if (NSS_STATUS_TRYAGAIN > status || status > NSS_STATUS_RETURN) if (NSS_STATUS_TRYAGAIN > status || status > NSS_STATUS_RETURN)
__libc_fatal ("illegal status in internal_getgrouplist"); __libc_fatal ("Illegal status in internal_getgrouplist.\n");
/* For compatibility reason we will continue to look for more /* For compatibility reason we will continue to look for more
entries using the next service even though data has already entries using the next service even though data has already

3
include/stdio.h
View File

@ -98,7 +98,8 @@ enum __libc_message_action
do_backtrace = 1 << 1 /* Backtrace. */ do_backtrace = 1 << 1 /* Backtrace. */
}; };
/* Print out MESSAGE on the error output and abort. */ /* Print out MESSAGE (which should end with a newline) on the error output
and abort. */
extern void __libc_fatal (const char *__message) extern void __libc_fatal (const char *__message)
__attribute__ ((__noreturn__)); __attribute__ ((__noreturn__));
extern void __libc_message (enum __libc_message_action action, extern void __libc_message (enum __libc_message_action action,

2
nptl/pthread_cond_wait.c
View File

@ -516,7 +516,7 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
struct timespec rt; struct timespec rt;
if (__clock_gettime (CLOCK_MONOTONIC, &rt) != 0) if (__clock_gettime (CLOCK_MONOTONIC, &rt) != 0)
__libc_fatal ("clock_gettime does not support " __libc_fatal ("clock_gettime does not support "
"CLOCK_MONOTONIC"); "CLOCK_MONOTONIC\n");
/* Convert the absolute timeout value to a relative /* Convert the absolute timeout value to a relative
timeout. */ timeout. */
rt.tv_sec = abstime->tv_sec - rt.tv_sec; rt.tv_sec = abstime->tv_sec - rt.tv_sec;

2
nscd/initgrcache.c
View File

@ -159,7 +159,7 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
/* This is really only for debugging. */ /* This is really only for debugging. */
if (NSS_STATUS_TRYAGAIN > status || status > NSS_STATUS_RETURN) if (NSS_STATUS_TRYAGAIN > status || status > NSS_STATUS_RETURN)
__libc_fatal ("illegal status in internal_getgrouplist"); __libc_fatal ("Illegal status in internal_getgrouplist.\n");
any_success |= status == NSS_STATUS_SUCCESS; any_success |= status == NSS_STATUS_SUCCESS;

2
nss/nsswitch.c
View File

@ -235,7 +235,7 @@ __nss_next2 (service_user **ni, const char *fct_name, const char *fct2_name,
/* This is really only for debugging. */ /* This is really only for debugging. */
if (__builtin_expect (NSS_STATUS_TRYAGAIN > status if (__builtin_expect (NSS_STATUS_TRYAGAIN > status
|| status > NSS_STATUS_RETURN, 0)) || status > NSS_STATUS_RETURN, 0))
__libc_fatal ("illegal status in __nss_next"); __libc_fatal ("Illegal status in __nss_next.\n");
if (nss_next_action (*ni, status) == NSS_ACTION_RETURN) if (nss_next_action (*ni, status) == NSS_ACTION_RETURN)
return 1; return 1;

2
sysdeps/aarch64/dl-irel.h
View File

@ -47,7 +47,7 @@ elf_irela (const ElfW(Rela) *reloc)
*reloc_addr = value; *reloc_addr = value;
} }
else else
__libc_fatal ("unexpected reloc type in static binary"); __libc_fatal ("Unexpected reloc type in static binary.\n");
} }
#endif #endif

2
sysdeps/arm/dl-irel.h
View File

@ -46,7 +46,7 @@ elf_irel (const Elf32_Rel *reloc)
*reloc_addr = value; *reloc_addr = value;
} }
else else
__libc_fatal ("unexpected reloc type in static binary"); __libc_fatal ("Unexpected reloc type in static binary.\n");
} }
#endif /* dl-irel.h */ #endif /* dl-irel.h */

2
sysdeps/generic/unwind-dw2.c
View File

@ -843,7 +843,7 @@ execute_cfa_program (const unsigned char *insn_ptr,
struct frame_state_reg_info *old_rs = fs->regs.prev; struct frame_state_reg_info *old_rs = fs->regs.prev;
#ifdef _LIBC #ifdef _LIBC
if (old_rs == NULL) if (old_rs == NULL)
__libc_fatal ("invalid DWARF unwind data"); __libc_fatal ("Invalid DWARF unwind data.\n");
else else
#endif #endif
{ {

2
sysdeps/i386/dl-irel.h
View File

@ -45,7 +45,7 @@ elf_irel (const Elf32_Rel *reloc)
*reloc_addr = value; *reloc_addr = value;
} }
else else
__libc_fatal ("unexpected reloc type in static binary"); __libc_fatal ("Unexpected reloc type in static binary.\n");
} }
#endif /* dl-irel.h */ #endif /* dl-irel.h */

2
sysdeps/nptl/futex-internal.h
View File

@ -197,7 +197,7 @@ futex_wake (unsigned int* futex_word, int processes_to_wake, int private);
static __always_inline __attribute__ ((__noreturn__)) void static __always_inline __attribute__ ((__noreturn__)) void
futex_fatal_error (void) futex_fatal_error (void)
{ {
__libc_fatal ("The futex facility returned an unexpected error code."); __libc_fatal ("The futex facility returned an unexpected error code.\n");
} }
#endif /* futex-internal.h */ #endif /* futex-internal.h */

2
sysdeps/powerpc/powerpc32/dl-irel.h
View File

@ -46,7 +46,7 @@ elf_irela (const Elf32_Rela *reloc)
*reloc_addr = value; *reloc_addr = value;
} }
else else
__libc_fatal ("unexpected reloc type in static binary"); __libc_fatal ("Unexpected reloc type in static binary.\n");
} }
#endif /* dl-irel.h */ #endif /* dl-irel.h */

2
sysdeps/powerpc/powerpc64/dl-irel.h
View File

@ -57,7 +57,7 @@ elf_irela (const Elf64_Rela *reloc)
#endif #endif
} }
else else
__libc_fatal ("unexpected reloc type in static binary"); __libc_fatal ("Unexpected reloc type in static binary.\n");
} }
#endif /* dl-irel.h */ #endif /* dl-irel.h */

2
sysdeps/s390/dl-irel.h
View File

@ -46,7 +46,7 @@ elf_irela (const ElfW(Rela) *reloc)
*reloc_addr = value; *reloc_addr = value;
} }
else else
__libc_fatal ("unexpected reloc type in static binary"); __libc_fatal ("Unexpected reloc type in static binary.\n");
} }
#endif /* dl-irel.h */ #endif /* dl-irel.h */

2
sysdeps/sparc/sparc32/dl-irel.h
View File

@ -56,7 +56,7 @@ elf_irela (const Elf32_Rela *reloc)
else if (r_type == R_SPARC_NONE) else if (r_type == R_SPARC_NONE)
; ;
else else
__libc_fatal ("unexpected reloc type in static binary"); __libc_fatal ("Unexpected reloc type in static binary.\n");
} }
#endif /* dl-irel.h */ #endif /* dl-irel.h */

2
sysdeps/sparc/sparc64/dl-irel.h
View File

@ -59,7 +59,7 @@ elf_irela (const Elf64_Rela *reloc)
else if (r_type == R_SPARC_NONE) else if (r_type == R_SPARC_NONE)
; ;
else else
__libc_fatal ("unexpected reloc type in static binary"); __libc_fatal ("Unexpected reloc type in static binary.\n");
} }
#endif /* dl-irel.h */ #endif /* dl-irel.h */

4
sysdeps/unix/sysv/linux/netlink_assert_response.c
View File

@ -72,12 +72,12 @@ __netlink_assert_response (int fd, ssize_t result)
char message[200]; char message[200];
if (family < 0) if (family < 0)
__snprintf (message, sizeof (message), __snprintf (message, sizeof (message),
"Unexpected error %d on netlink descriptor %d", "Unexpected error %d on netlink descriptor %d.\n",
error_code, fd); error_code, fd);
else else
__snprintf (message, sizeof (message), __snprintf (message, sizeof (message),
"Unexpected error %d on netlink descriptor %d" "Unexpected error %d on netlink descriptor %d"
" (address family %d)", " (address family %d).\n",
error_code, fd, family); error_code, fd, family);
__libc_fatal (message); __libc_fatal (message);
} }

2
sysdeps/x86_64/dl-irel.h
View File

@ -45,7 +45,7 @@ elf_irela (const ElfW(Rela) *reloc)
*reloc_addr = value; *reloc_addr = value;
} }
else else
__libc_fatal ("unexpected reloc type in static binary"); __libc_fatal ("Unexpected reloc type in static binary.\n");
} }
#endif /* dl-irel.h */ #endif /* dl-irel.h */