summaryrefslogtreecommitdiff
path: root/elf/tst-audit12mod2.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2015-11-09 16:52:31 +0100
committerFlorian Weimer <fweimer@redhat.com>2015-11-09 17:01:46 +0100
commita1b85ae88b1a664e93ca0182c82f7763dd5a1754 (patch)
tree1d79be13026ebc25bc24caabfc1f79281b44a539 /elf/tst-audit12mod2.c
parent37d13b179cd726bb6d61bfe2f31a1206bc1d9703 (diff)
ld.so: Add original DSO name if overridden by audit module [BZ #18251]
* elf/dl-load.c (_dl_map_object_from_fd): Add additional parameter for original name of the DSO. Add it to the name list of the DSO if it is actually given. (_dl_map_object): Keep track of whether an audit module rewrote the file name. If yes, pass the original name to _dl_map_object_from_fd in a new parameter, otherwise NULL. When debugging is enabled, log the change of the file name. * sysdeps/mach/hur/dl-sysdep.c: Adjust commented-out call to _dl_map_object_from_fd. * elf/Makefile: Build and run tst-audit11 and tst-audit12. * elf/tst-audit11.c: New file * elf/tst-auditmod11.c: New file. * elf/tst-audit11mod1.c: New file. * elf/tst-audit11mod2.c: New file. * elf/tst-audit11mod2.map: New file. * elf/tst-audit12.c: New file * elf/tst-auditmod12.c: New file. * elf/tst-audit12mod1.c: New file. * elf/tst-audit12mod2.c: New file. * elf/tst-audit12mod2.map: New file. * elf/tst-audit12mod3.c: New file.
Diffstat (limited to 'elf/tst-audit12mod2.c')
-rw-r--r--elf/tst-audit12mod2.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/elf/tst-audit12mod2.c b/elf/tst-audit12mod2.c
new file mode 100644
index 0000000000..de48b6a05d
--- /dev/null
+++ b/elf/tst-audit12mod2.c
@@ -0,0 +1,23 @@
+/* Replaced DSO referenced by tst-audit12mod1.so, for tst-audit12.
+ Copyright (C) 2015 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/>. */
+
+int
+f2 (void)
+{
+ return 42;
+}