AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-22 04:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mark _init and _fini as hidden [BZ #23145]

Browse Source 
_init and _fini are special functions provided by glibc for linker to
define DT_INIT and DT_FINI in executable and shared library.  They
should never be put in dynamic symbol table.  This patch marks them as
hidden to remove them from dynamic symbol table.

Tested with build-many-glibcs.py.

	[BZ #23145]
	* elf/Makefile (tests-special): Add $(objpfx)check-initfini.out.
	($(all-built-dso:=.dynsym): New target.
	(common-generated): Add $(all-built-dso:$(common-objpfx)%=%.dynsym).
	($(objpfx)check-initfini.out): New target.
	(generated): Add check-initfini.out.
	* scripts/check-initfini.awk: New file.
	* sysdeps/aarch64/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/alpha/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/arm/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/hppa/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/i386/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/ia64/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/m68k/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/microblaze/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/mips/mips32/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/mips/mips64/n32/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/mips/mips64/n64/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/nios2/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/powerpc/powerpc32/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/powerpc/powerpc64/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/s390/s390-32/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/s390/s390-64/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/sh/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/sparc/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
	* sysdeps/x86_64/crti.S (_init): Mark as hidden.
	(_fini): Likewise.
This commit is contained in:
H.J. Lu 2018-06-08 10:28:38 -07:00
parent 1c09524e4d
commit 67c0579669
22 changed files with 163 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ChangeLog
View File

@ -1,3 +1,51 @@
2018-06-08 H.J. Lu <hongjiu.lu@intel.com>
[BZ #23145]
* elf/Makefile (tests-special): Add $(objpfx)check-initfini.out.
($(all-built-dso:=.dynsym): New target.
(common-generated): Add $(all-built-dso:$(common-objpfx)%=%.dynsym).
($(objpfx)check-initfini.out): New target.
(generated): Add check-initfini.out.
* scripts/check-initfini.awk: New file.
* sysdeps/aarch64/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/alpha/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/arm/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/hppa/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/i386/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/ia64/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/m68k/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/microblaze/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/mips/mips32/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/mips/mips64/n32/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/mips/mips64/n64/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/nios2/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/powerpc/powerpc32/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/powerpc/powerpc64/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/s390/s390-32/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/s390/s390-64/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/sh/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/sparc/crti.S (_init): Mark as hidden.
(_fini): Likewise.
* sysdeps/x86_64/crti.S (_init): Mark as hidden.
(_fini): Likewise.
2018-06-06 Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com> 2018-06-06 Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
* sysdeps/powerpc/powerpc64/le/fpu/e_sqrtf128.c * sysdeps/powerpc/powerpc64/le/fpu/e_sqrtf128.c

15
elf/Makefile
View File

@ -348,7 +348,7 @@ ifeq ($(run-built-tests),yes)
tests-special += $(objpfx)tst-pathopt.out $(objpfx)tst-rtld-load-self.out tests-special += $(objpfx)tst-pathopt.out $(objpfx)tst-rtld-load-self.out
endif endif
tests-special += $(objpfx)check-textrel.out $(objpfx)check-execstack.out \ tests-special += $(objpfx)check-textrel.out $(objpfx)check-execstack.out \
$(objpfx)check-localplt.out $(objpfx)check-localplt.out $(objpfx)check-initfini.out
endif endif
ifeq ($(run-built-tests),yes) ifeq ($(run-built-tests),yes)
@ -1136,6 +1136,19 @@ $(objpfx)check-localplt.out: $(..)scripts/check-localplt.awk \
$(evaluate-test) $(evaluate-test)
endif endif
$(all-built-dso:=.dynsym): %.dynsym: %
@rm -f $@T
LC_ALL=C $(READELF) -W --dyn-syms $< > $@T
test -s $@T
mv -f $@T $@
common-generated += $(all-built-dso:$(common-objpfx)%=%.dynsym)
$(objpfx)check-initfini.out: $(..)scripts/check-initfini.awk \
$(all-built-dso:=.dynsym)
LC_ALL=C $(AWK) -f $^ > $@; \
$(evaluate-test)
generated += check-initfini.out
$(objpfx)tst-dlopenrpathmod.so: $(libdl) $(objpfx)tst-dlopenrpathmod.so: $(libdl)
$(objpfx)tst-dlopenrpath: $(objpfx)tst-dlopenrpathmod.so $(libdl) $(objpfx)tst-dlopenrpath: $(objpfx)tst-dlopenrpathmod.so $(libdl)
CFLAGS-tst-dlopenrpath.c += -DPFX=\"$(objpfx)\" CFLAGS-tst-dlopenrpath.c += -DPFX=\"$(objpfx)\"

63
scripts/check-initfini.awk Normal file
View File

@ -0,0 +1,63 @@
# Copyright (C) 2018 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
# The GNU C Library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
# You should have received a copy of the GNU Lesser General Public
# License along with the GNU C Library; if not, see
# <http://www.gnu.org/licenses/>.
# This awk script expects to get command-line files that are each
# the output of 'readelf -W --dyn-syms' on a single shared object.
# It exits successfully (0) if none contained _init nor _fini in dynamic
# symbol table.
# It fails (1) if any did contain _init or _fini in dynamic symbol table.
# It fails (2) if the input did not take the expected form.
BEGIN { result = _init = _fini = sanity = 0 }
function check_one(name) {
if (!sanity) {
print name ": *** input did not look like readelf -d output";
result = 2;
} else {
ok = 1;
if (_init) {
print name ": *** _init is in dynamic symbol table";
result = result ? result : 1;
ok = 0;
}
if (_fini) {
print name ": *** _fini is in dynamic symbol table";
result = result ? result : 1;
ok = 0;
}
if (ok)
print name ": OK";
}
_init = _fini = sanity = 0
}
FILENAME != lastfile {
if (lastfile)
check_one(lastfile);
lastfile = FILENAME;
}
$1 == "Symbol" && $2 == "table" && $3 == "'.dynsym'" { sanity = 1 }
$8 == "_init" { _init = 1 }
$8 == "_fini" { _fini = 1 }
END {
check_one(lastfile);
exit(result);
}

2
sysdeps/aarch64/crti.S
View File

@ -72,6 +72,7 @@ call_weak_fn:
.section .init,"ax",%progbits .section .init,"ax",%progbits
.align 2 .align 2
.global _init .global _init
.hidden _init
.type _init, %function .type _init, %function
_init: _init:
stp x29, x30, [sp, -16]! stp x29, x30, [sp, -16]!
@ -85,6 +86,7 @@ _init:
.section .fini,"ax",%progbits .section .fini,"ax",%progbits
.align 2 .align 2
.global _fini .global _fini
.hidden _fini
.type _fini, %function .type _fini, %function
_fini: _fini:
stp x29, x30, [sp, -16]! stp x29, x30, [sp, -16]!

2
sysdeps/alpha/crti.S
View File

@ -67,6 +67,7 @@
.section .init, "ax", @progbits .section .init, "ax", @progbits
.globl _init .globl _init
.hidden _init
.type _init, @function .type _init, @function
.usepv _init, std .usepv _init, std
_init: _init:
@ -89,6 +90,7 @@ _init:
.section .fini, "ax", @progbits .section .fini, "ax", @progbits
.globl _fini .globl _fini
.hidden _fini
.type _fini,@function .type _fini,@function
.usepv _fini,std .usepv _fini,std
_fini: _fini:

2
sysdeps/arm/crti.S
View File

@ -78,6 +78,7 @@ call_weak_fn:
.section .init,"ax",%progbits .section .init,"ax",%progbits
.p2align 2 .p2align 2
.globl _init .globl _init
.hidden _init
.type _init, %function .type _init, %function
_init: _init:
push {r3, lr} push {r3, lr}
@ -90,6 +91,7 @@ _init:
.section .fini,"ax",%progbits .section .fini,"ax",%progbits
.p2align 2 .p2align 2
.globl _fini .globl _fini
.hidden _fini
.type _fini, %function .type _fini, %function
_fini: _fini:
push {r3, lr} push {r3, lr}

2
sysdeps/hppa/crti.S
View File

@ -142,6 +142,7 @@ gmon_initializer:
.section .init, "ax", %progbits .section .init, "ax", %progbits
.align 4 .align 4
.globl _init .globl _init
.hidden _init
.type _init,@function .type _init,@function
_init: _init:
stw %rp,-20(%sp) stw %rp,-20(%sp)
@ -152,6 +153,7 @@ _init:
.section .fini,"ax",%progbits .section .fini,"ax",%progbits
.align 4 .align 4
.globl _fini .globl _fini
.hidden _fini
.type _fini,@function .type _fini,@function
_fini: _fini:
stw %rp,-20(%sp) stw %rp,-20(%sp)

2
sysdeps/i386/crti.S
View File

@ -58,6 +58,7 @@
.section .init,"ax",@progbits .section .init,"ax",@progbits
.p2align 2 .p2align 2
.globl _init .globl _init
.hidden _init
.type _init, @function .type _init, @function
_init: _init:
pushl %ebx pushl %ebx
@ -77,6 +78,7 @@ _init:
.section .fini,"ax",@progbits .section .fini,"ax",@progbits
.p2align 2 .p2align 2
.globl _fini .globl _fini
.hidden _fini
.type _fini, @function .type _fini, @function
_fini: _fini:
pushl %ebx pushl %ebx

2
sysdeps/ia64/crti.S
View File

@ -129,6 +129,7 @@ gmon_initializer:
.section .init,"ax",@progbits .section .init,"ax",@progbits
.global _init# .global _init#
.hidden _init#
.proc _init# .proc _init#
_init: _init:
.prologue .prologue
@ -145,6 +146,7 @@ _init:
.section .fini,"ax",@progbits .section .fini,"ax",@progbits
.global _fini# .global _fini#
.hidden _fini#
.proc _fini# .proc _fini#
_fini: _fini:
.prologue .prologue

2
sysdeps/m68k/crti.S
View File

@ -58,6 +58,7 @@
.section .init,"ax",@progbits .section .init,"ax",@progbits
.align 2 .align 2
.globl _init .globl _init
.hidden _init
.type _init, @function .type _init, @function
_init: _init:
link.w %fp, #0 link.w %fp, #0
@ -75,6 +76,7 @@ _init:
.section .fini,"ax",@progbits .section .fini,"ax",@progbits
.align 2 .align 2
.globl _fini .globl _fini
.hidden _fini
.type _fini, @function .type _fini, @function
_fini: _fini:
link.w %fp, #0 link.w %fp, #0

2
sysdeps/microblaze/crti.S
View File

@ -58,6 +58,7 @@
.section .init,"ax",@progbits .section .init,"ax",@progbits
.align 2 .align 2
.globl _init .globl _init
.hidden _init
.type _init, @function .type _init, @function
_init: _init:
addik r1,r1,-32 addik r1,r1,-32
@ -79,6 +80,7 @@ $Lno_weak_fn:
.section .fini,"ax",@progbits .section .fini,"ax",@progbits
.align 2 .align 2
.globl _fini .globl _fini
.hidden _fini
.type _fini, @function .type _fini, @function
_fini: _fini:
addik r1,r1,-32 addik r1,r1,-32

2
sysdeps/mips/mips32/crti.S
View File

@ -65,6 +65,7 @@
.section .init,"ax",@progbits .section .init,"ax",@progbits
.p2align 2 .p2align 2
.globl _init .globl _init
.hidden _init
.type _init, @function .type _init, @function
_init: _init:
.set noreorder .set noreorder
@ -90,6 +91,7 @@ _init:
.section .fini,"ax",@progbits .section .fini,"ax",@progbits
.p2align 2 .p2align 2
.globl _fini .globl _fini
.hidden _fini
.type _fini, @function .type _fini, @function
_fini: _fini:
.set noreorder .set noreorder

2
sysdeps/mips/mips64/n32/crti.S
View File

@ -65,6 +65,7 @@
.section .init,"ax",@progbits .section .init,"ax",@progbits
.p2align 2 .p2align 2
.globl _init .globl _init
.hidden _init
.type _init, @function .type _init, @function
_init: _init:
addiu $sp,$sp,-16 addiu $sp,$sp,-16
@ -90,6 +91,7 @@ _init:
.section .fini,"ax",@progbits .section .fini,"ax",@progbits
.p2align 2 .p2align 2
.globl _fini .globl _fini
.hidden _fini
.type _fini, @function .type _fini, @function
_fini: _fini:
addiu $sp,$sp,-16 addiu $sp,$sp,-16

2
sysdeps/mips/mips64/n64/crti.S
View File

@ -65,6 +65,7 @@
.section .init,"ax",@progbits .section .init,"ax",@progbits
.p2align 2 .p2align 2
.globl _init .globl _init
.hidden _init
.type _init, @function .type _init, @function
_init: _init:
daddiu $sp,$sp,-16 daddiu $sp,$sp,-16
@ -90,6 +91,7 @@ _init:
.section .fini,"ax",@progbits .section .fini,"ax",@progbits
.p2align 2 .p2align 2
.globl _fini .globl _fini
.hidden _fini
.type _fini, @function .type _fini, @function
_fini: _fini:
daddiu $sp,$sp,-16 daddiu $sp,$sp,-16

2
sysdeps/nios2/crti.S
View File

@ -57,6 +57,7 @@
.section .init,"ax",@progbits .section .init,"ax",@progbits
.align 2 .align 2
.global _init .global _init
.hidden _init
.type _init, @function .type _init, @function
_init: _init:
addi sp, sp, -8 addi sp, sp, -8
@ -84,6 +85,7 @@ _init:
.section .fini,"ax",@progbits .section .fini,"ax",@progbits
.align 2 .align 2
.global _fini .global _fini
.hidden _fini
.type _fini, @function .type _fini, @function
_fini: _fini:
addi sp, sp, -8 addi sp, sp, -8

2
sysdeps/powerpc/powerpc32/crti.S
View File

@ -58,6 +58,7 @@
.section .init,"ax",@progbits .section .init,"ax",@progbits
.align 2 .align 2
.globl _init .globl _init
.hidden _init
.type _init, @function .type _init, @function
_init: _init:
stwu r1, -16(r1) stwu r1, -16(r1)
@ -80,6 +81,7 @@ _init:
.section .fini,"ax",@progbits .section .fini,"ax",@progbits
.align 2 .align 2
.globl _fini .globl _fini
.hidden _fini
.type _fini, @function .type _fini, @function
_fini: _fini:
stwu r1, -16(r1) stwu r1, -16(r1)

2
sysdeps/powerpc/powerpc64/crti.S
View File

@ -62,6 +62,7 @@
#endif #endif
.section ".init", "ax", @progbits .section ".init", "ax", @progbits
ENTRY_2(_init) ENTRY_2(_init)
.hidden _init
.align ALIGNARG (2) .align ALIGNARG (2)
BODY_LABEL (_init): BODY_LABEL (_init):
LOCALENTRY(_init) LOCALENTRY(_init)
@ -80,6 +81,7 @@ BODY_LABEL (_init):
.section ".fini", "ax", @progbits .section ".fini", "ax", @progbits
ENTRY_2(_fini) ENTRY_2(_fini)
.hidden _fini
.align ALIGNARG (2) .align ALIGNARG (2)
BODY_LABEL (_fini): BODY_LABEL (_fini):
LOCALENTRY(_fini) LOCALENTRY(_fini)

2
sysdeps/s390/s390-32/crti.S
View File

@ -57,6 +57,7 @@
.section .init,"ax",@progbits .section .init,"ax",@progbits
.globl _init .globl _init
.hidden _init
.type _init,@function .type _init,@function
.align 4 .align 4
_init: _init:
@ -88,6 +89,7 @@ _init:
.section .fini,"ax",@progbits .section .fini,"ax",@progbits
.globl _fini .globl _fini
.hidden _fini
.type _fini,@function .type _fini,@function
.align 4 .align 4
_fini: _fini:

2
sysdeps/s390/s390-64/crti.S
View File

@ -59,6 +59,7 @@
.section .init,"ax",@progbits .section .init,"ax",@progbits
.align 4 .align 4
.globl _init .globl _init
.hidden _init
.type _init,@function .type _init,@function
_init: _init:
stmg %r6,%r15,48(%r15) stmg %r6,%r15,48(%r15)
@ -81,6 +82,7 @@ _init:
.section .fini,"ax",@progbits .section .fini,"ax",@progbits
.align 4 .align 4
.globl _fini .globl _fini
.hidden _fini
.type _fini,@function .type _fini,@function
_fini: _fini:
stmg %r6,%r15,48(%r15) stmg %r6,%r15,48(%r15)

2
sysdeps/sh/crti.S
View File

@ -58,6 +58,7 @@
.section .init,"ax",@progbits .section .init,"ax",@progbits
.align 5 .align 5
.global _init .global _init
.hidden _init
.type _init, @function .type _init, @function
_init: _init:
mov.l r12,@-r15 mov.l r12,@-r15
@ -103,6 +104,7 @@ _init:
.section .fini,"ax",@progbits .section .fini,"ax",@progbits
.align 5 .align 5
.global _fini .global _fini
.hidden _fini
.type _fini, @function .type _fini, @function
_fini: _fini:
mov.l r12,@-r15 mov.l r12,@-r15

2
sysdeps/sparc/crti.S
View File

@ -66,6 +66,7 @@
.section .init,"ax",@progbits .section .init,"ax",@progbits
.p2align 2 .p2align 2
.globl _init .globl _init
.hidden _init
.type _init, @function .type _init, @function
_init: _init:
save %sp, -STACKFRAME_SIZE, %sp save %sp, -STACKFRAME_SIZE, %sp
@ -88,6 +89,7 @@ _init:
.section .fini,"ax",@progbits .section .fini,"ax",@progbits
.p2align 2 .p2align 2
.globl _fini .globl _fini
.hidden _fini
.type _fini, @function .type _fini, @function
_fini: _fini:
save %sp, -STACKFRAME_SIZE, %sp save %sp, -STACKFRAME_SIZE, %sp

2
sysdeps/x86_64/crti.S
View File

@ -58,6 +58,7 @@
.section .init,"ax",@progbits .section .init,"ax",@progbits
.p2align 2 .p2align 2
.globl _init .globl _init
.hidden _init
.type _init, @function .type _init, @function
_init: _init:
/* Maintain 16-byte stack alignment for called functions. */ /* Maintain 16-byte stack alignment for called functions. */
@ -75,6 +76,7 @@ _init:
.section .fini,"ax",@progbits .section .fini,"ax",@progbits
.p2align 2 .p2align 2
.globl _fini .globl _fini
.hidden _fini
.type _fini, @function .type _fini, @function
_fini: _fini:
subq $8, %rsp subq $8, %rsp