diff options
author | Paul Pluzhnikov <ppluzhnikov@google.com> | 2018-08-31 18:04:32 -0700 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2018-12-11 23:34:31 +0100 |
commit | da90d37133f08c063d855b36b30f14f022db952a (patch) | |
tree | d079c92d3b1e53eb0b4b495821d0b3153690bdc4 | |
parent | nscd: Fix use-after-free in addgetnetgrentX [BZ #23520] (diff) | |
download | glibc-da90d37133f08c063d855b36b30f14f022db952a.tar.gz glibc-da90d37133f08c063d855b36b30f14f022db952a.tar.bz2 glibc-da90d37133f08c063d855b36b30f14f022db952a.zip |
[BZ #20271] Add newlines in __libc_fatal calls.
(cherry picked from commit a6e8926f8d49a213a9abb1a61f6af964f612ab7f)
(cherry picked from commit 9071be6b3f78da905ab2b6403933fe14d4482e47)
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
-rw-r--r-- | ChangeLog | 22 | ||||
-rw-r--r-- | grp/initgroups.c | 2 | ||||
-rw-r--r-- | include/stdio.h | 3 | ||||
-rw-r--r-- | nptl/pthread_cond_wait.c | 2 | ||||
-rw-r--r-- | nscd/initgrcache.c | 2 | ||||
-rw-r--r-- | nss/nsswitch.c | 2 | ||||
-rw-r--r-- | sysdeps/aarch64/dl-irel.h | 2 | ||||
-rw-r--r-- | sysdeps/arm/dl-irel.h | 2 | ||||
-rw-r--r-- | sysdeps/generic/unwind-dw2.c | 2 | ||||
-rw-r--r-- | sysdeps/i386/dl-irel.h | 2 | ||||
-rw-r--r-- | sysdeps/nptl/futex-internal.h | 2 | ||||
-rw-r--r-- | sysdeps/powerpc/powerpc32/dl-irel.h | 2 | ||||
-rw-r--r-- | sysdeps/powerpc/powerpc64/dl-irel.h | 2 | ||||
-rw-r--r-- | sysdeps/s390/dl-irel.h | 2 | ||||
-rw-r--r-- | sysdeps/sparc/sparc32/dl-irel.h | 2 | ||||
-rw-r--r-- | sysdeps/sparc/sparc64/dl-irel.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/netlink_assert_response.c | 4 | ||||
-rw-r--r-- | sysdeps/x86_64/dl-irel.h | 2 |
18 files changed, 41 insertions, 18 deletions
@@ -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> [BZ #23520] diff --git a/grp/initgroups.c b/grp/initgroups.c index f056fbf5aa..93e7f5814d 100644 --- a/grp/initgroups.c +++ b/grp/initgroups.c @@ -128,7 +128,7 @@ internal_getgrouplist (const char *user, gid_t group, long int *size, /* This is really only for debugging. */ 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 entries using the next service even though data has already diff --git a/include/stdio.h b/include/stdio.h index 9162d4e247..7a5c09089f 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -98,7 +98,8 @@ enum __libc_message_action 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) __attribute__ ((__noreturn__)); extern void __libc_message (enum __libc_message_action action, diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c index 3e11054182..ebf07ca82d 100644 --- a/nptl/pthread_cond_wait.c +++ b/nptl/pthread_cond_wait.c @@ -516,7 +516,7 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, struct timespec rt; if (__clock_gettime (CLOCK_MONOTONIC, &rt) != 0) __libc_fatal ("clock_gettime does not support " - "CLOCK_MONOTONIC"); + "CLOCK_MONOTONIC\n"); /* Convert the absolute timeout value to a relative timeout. */ rt.tv_sec = abstime->tv_sec - rt.tv_sec; diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c index 2c74951f57..4764f14a45 100644 --- a/nscd/initgrcache.c +++ b/nscd/initgrcache.c @@ -159,7 +159,7 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req, /* This is really only for debugging. */ 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; diff --git a/nss/nsswitch.c b/nss/nsswitch.c index ee46f24424..3c48b4b85e 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -235,7 +235,7 @@ __nss_next2 (service_user **ni, const char *fct_name, const char *fct2_name, /* This is really only for debugging. */ if (__builtin_expect (NSS_STATUS_TRYAGAIN > status || 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) return 1; diff --git a/sysdeps/aarch64/dl-irel.h b/sysdeps/aarch64/dl-irel.h index 5889ee187b..bef71ed0f3 100644 --- a/sysdeps/aarch64/dl-irel.h +++ b/sysdeps/aarch64/dl-irel.h @@ -47,7 +47,7 @@ elf_irela (const ElfW(Rela) *reloc) *reloc_addr = value; } else - __libc_fatal ("unexpected reloc type in static binary"); + __libc_fatal ("Unexpected reloc type in static binary.\n"); } #endif diff --git a/sysdeps/arm/dl-irel.h b/sysdeps/arm/dl-irel.h index a7b6456075..be6eb7743e 100644 --- a/sysdeps/arm/dl-irel.h +++ b/sysdeps/arm/dl-irel.h @@ -46,7 +46,7 @@ elf_irel (const Elf32_Rel *reloc) *reloc_addr = value; } else - __libc_fatal ("unexpected reloc type in static binary"); + __libc_fatal ("Unexpected reloc type in static binary.\n"); } #endif /* dl-irel.h */ diff --git a/sysdeps/generic/unwind-dw2.c b/sysdeps/generic/unwind-dw2.c index 082609b34a..724c16a7f0 100644 --- a/sysdeps/generic/unwind-dw2.c +++ b/sysdeps/generic/unwind-dw2.c @@ -843,7 +843,7 @@ execute_cfa_program (const unsigned char *insn_ptr, struct frame_state_reg_info *old_rs = fs->regs.prev; #ifdef _LIBC if (old_rs == NULL) - __libc_fatal ("invalid DWARF unwind data"); + __libc_fatal ("Invalid DWARF unwind data.\n"); else #endif { diff --git a/sysdeps/i386/dl-irel.h b/sysdeps/i386/dl-irel.h index 55303180c7..bcaf0668ac 100644 --- a/sysdeps/i386/dl-irel.h +++ b/sysdeps/i386/dl-irel.h @@ -45,7 +45,7 @@ elf_irel (const Elf32_Rel *reloc) *reloc_addr = value; } else - __libc_fatal ("unexpected reloc type in static binary"); + __libc_fatal ("Unexpected reloc type in static binary.\n"); } #endif /* dl-irel.h */ diff --git a/sysdeps/nptl/futex-internal.h b/sysdeps/nptl/futex-internal.h index 1a5624789d..6fd27f0df6 100644 --- a/sysdeps/nptl/futex-internal.h +++ b/sysdeps/nptl/futex-internal.h @@ -197,7 +197,7 @@ futex_wake (unsigned int* futex_word, int processes_to_wake, int private); static __always_inline __attribute__ ((__noreturn__)) 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 */ diff --git a/sysdeps/powerpc/powerpc32/dl-irel.h b/sysdeps/powerpc/powerpc32/dl-irel.h index a7368b2582..61d0e4cf61 100644 --- a/sysdeps/powerpc/powerpc32/dl-irel.h +++ b/sysdeps/powerpc/powerpc32/dl-irel.h @@ -46,7 +46,7 @@ elf_irela (const Elf32_Rela *reloc) *reloc_addr = value; } else - __libc_fatal ("unexpected reloc type in static binary"); + __libc_fatal ("Unexpected reloc type in static binary.\n"); } #endif /* dl-irel.h */ diff --git a/sysdeps/powerpc/powerpc64/dl-irel.h b/sysdeps/powerpc/powerpc64/dl-irel.h index ab13c04358..2fd0ee8a86 100644 --- a/sysdeps/powerpc/powerpc64/dl-irel.h +++ b/sysdeps/powerpc/powerpc64/dl-irel.h @@ -57,7 +57,7 @@ elf_irela (const Elf64_Rela *reloc) #endif } else - __libc_fatal ("unexpected reloc type in static binary"); + __libc_fatal ("Unexpected reloc type in static binary.\n"); } #endif /* dl-irel.h */ diff --git a/sysdeps/s390/dl-irel.h b/sysdeps/s390/dl-irel.h index d8ba7ba427..ecb24f0a9b 100644 --- a/sysdeps/s390/dl-irel.h +++ b/sysdeps/s390/dl-irel.h @@ -46,7 +46,7 @@ elf_irela (const ElfW(Rela) *reloc) *reloc_addr = value; } else - __libc_fatal ("unexpected reloc type in static binary"); + __libc_fatal ("Unexpected reloc type in static binary.\n"); } #endif /* dl-irel.h */ diff --git a/sysdeps/sparc/sparc32/dl-irel.h b/sysdeps/sparc/sparc32/dl-irel.h index ffca36864f..cf47cda834 100644 --- a/sysdeps/sparc/sparc32/dl-irel.h +++ b/sysdeps/sparc/sparc32/dl-irel.h @@ -56,7 +56,7 @@ elf_irela (const Elf32_Rela *reloc) else if (r_type == R_SPARC_NONE) ; else - __libc_fatal ("unexpected reloc type in static binary"); + __libc_fatal ("Unexpected reloc type in static binary.\n"); } #endif /* dl-irel.h */ diff --git a/sysdeps/sparc/sparc64/dl-irel.h b/sysdeps/sparc/sparc64/dl-irel.h index c5cd3057ac..446fed1836 100644 --- a/sysdeps/sparc/sparc64/dl-irel.h +++ b/sysdeps/sparc/sparc64/dl-irel.h @@ -59,7 +59,7 @@ elf_irela (const Elf64_Rela *reloc) else if (r_type == R_SPARC_NONE) ; else - __libc_fatal ("unexpected reloc type in static binary"); + __libc_fatal ("Unexpected reloc type in static binary.\n"); } #endif /* dl-irel.h */ diff --git a/sysdeps/unix/sysv/linux/netlink_assert_response.c b/sysdeps/unix/sysv/linux/netlink_assert_response.c index f31ccb52ff..6afc3a17ce 100644 --- a/sysdeps/unix/sysv/linux/netlink_assert_response.c +++ b/sysdeps/unix/sysv/linux/netlink_assert_response.c @@ -72,12 +72,12 @@ __netlink_assert_response (int fd, ssize_t result) char message[200]; if (family < 0) __snprintf (message, sizeof (message), - "Unexpected error %d on netlink descriptor %d", + "Unexpected error %d on netlink descriptor %d.\n", error_code, fd); else __snprintf (message, sizeof (message), "Unexpected error %d on netlink descriptor %d" - " (address family %d)", + " (address family %d).\n", error_code, fd, family); __libc_fatal (message); } diff --git a/sysdeps/x86_64/dl-irel.h b/sysdeps/x86_64/dl-irel.h index 6ecc50fb42..33f100d8b1 100644 --- a/sysdeps/x86_64/dl-irel.h +++ b/sysdeps/x86_64/dl-irel.h @@ -45,7 +45,7 @@ elf_irela (const ElfW(Rela) *reloc) *reloc_addr = value; } else - __libc_fatal ("unexpected reloc type in static binary"); + __libc_fatal ("Unexpected reloc type in static binary.\n"); } #endif /* dl-irel.h */ |