From: Alan Modra Date: Sun, 23 Apr 2017 05:51:11 +0000 (+0930) Subject: PR 21414, null pointer deref of _bfd_elf_large_com_section sym X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7eacd66b086cabb1daab20890d5481894d4f56b2;p=binutils-gdb.git PR 21414, null pointer deref of _bfd_elf_large_com_section sym PR 21414 * section.c (GLOBAL_SYM_INIT): Make available in bfd.h. * elf.c (lcomm_sym): New. (_bfd_elf_large_com_section): Use lcomm_sym section symbol. * bfd-in2.h: Regenerate. --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 9b5f15dc24a..028804624b2 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2017-04-23 Alan Modra + + PR 21414 + * section.c (GLOBAL_SYM_INIT): Make available in bfd.h. + * elf.c (lcomm_sym): New. + (_bfd_elf_large_com_section): Use lcomm_sym section symbol. + * bfd-in2.h: Regenerate. + 2017-04-23 Alan Modra PR 21412 diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 1d73134a6d9..17a35c09edf 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -1839,6 +1839,18 @@ extern asection _bfd_std_section[4]; { NULL }, { NULL } \ } +/* We use a macro to initialize the static asymbol structures because + traditional C does not permit us to initialize a union member while + gcc warns if we don't initialize it. + the_bfd, name, value, attr, section [, udata] */ +#ifdef __STDC__ +#define GLOBAL_SYM_INIT(NAME, SECTION) \ + { 0, NAME, 0, BSF_SECTION_SYM, SECTION, { 0 }} +#else +#define GLOBAL_SYM_INIT(NAME, SECTION) \ + { 0, NAME, 0, BSF_SECTION_SYM, SECTION } +#endif + void bfd_section_list_clear (bfd *); asection *bfd_get_section_by_name (bfd *abfd, const char *name); diff --git a/bfd/elf.c b/bfd/elf.c index dd1a41f6886..a08e0f8ea61 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -11244,9 +11244,11 @@ _bfd_elf_get_synthetic_symtab (bfd *abfd, /* It is only used by x86-64 so far. ??? This repeats *COM* id of zero. sec->id is supposed to be unique, - but current usage would allow all of _bfd_std_section to be zero. t*/ + but current usage would allow all of _bfd_std_section to be zero. */ +static const asymbol lcomm_sym + = GLOBAL_SYM_INIT ("LARGE_COMMON", &_bfd_elf_large_com_section); asection _bfd_elf_large_com_section - = BFD_FAKE_SECTION (_bfd_elf_large_com_section, NULL, + = BFD_FAKE_SECTION (_bfd_elf_large_com_section, &lcomm_sym, "LARGE_COMMON", 0, SEC_IS_COMMON); void diff --git a/bfd/section.c b/bfd/section.c index 4b3cf6a4c36..28eee7f8b3c 100644 --- a/bfd/section.c +++ b/bfd/section.c @@ -738,20 +738,20 @@ CODE_FRAGMENT . { NULL }, { NULL } \ . } . +.{* We use a macro to initialize the static asymbol structures because +. traditional C does not permit us to initialize a union member while +. gcc warns if we don't initialize it. +. the_bfd, name, value, attr, section [, udata] *} +.#ifdef __STDC__ +.#define GLOBAL_SYM_INIT(NAME, SECTION) \ +. { 0, NAME, 0, BSF_SECTION_SYM, SECTION, { 0 }} +.#else +.#define GLOBAL_SYM_INIT(NAME, SECTION) \ +. { 0, NAME, 0, BSF_SECTION_SYM, SECTION } +.#endif +. */ -/* We use a macro to initialize the static asymbol structures because - traditional C does not permit us to initialize a union member while - gcc warns if we don't initialize it. */ - /* the_bfd, name, value, attr, section [, udata] */ -#ifdef __STDC__ -#define GLOBAL_SYM_INIT(NAME, SECTION) \ - { 0, NAME, 0, BSF_SECTION_SYM, SECTION, { 0 }} -#else -#define GLOBAL_SYM_INIT(NAME, SECTION) \ - { 0, NAME, 0, BSF_SECTION_SYM, SECTION } -#endif - /* These symbols are global, not specific to any BFD. Therefore, anything that tries to change them is broken, and should be repaired. */