Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Fix shlib.lds generation
Generate sed command line used to create shlib.lds before invoking it to prevent buffer overflow in make. Fixes MER#472 Signed-off-by: Mikko Hurskainen <mikko.hurskainen@nomovok.com>
- Loading branch information
Mikko Hurskainen
committed
Jul 16, 2013
1 parent
0c537b1
commit b456f88
Showing
3 changed files
with
55 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
Index: eglibc-2.15/Makerules | ||
=================================================================== | ||
--- eglibc-2.15.orig/Makerules 2011-10-25 03:37:10.000000000 +0300 | ||
+++ eglibc-2.15/Makerules 2013-07-16 14:35:52.581191695 +0300 | ||
@@ -509,25 +509,19 @@ | ||
else | ||
# binutils only position loadable notes into the first page for binaries, | ||
# not for shared objects | ||
-$(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules | ||
- $(LINK.o) -shared -Wl,-O1 \ | ||
- -nostdlib -nostartfiles \ | ||
- $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS.so) \ | ||
- -Wl,--verbose 2>&1 | \ | ||
- sed > $@T \ | ||
- -e '/^=========/,/^=========/!d;/^=========/d' \ | ||
+shlib-lds-hash = -e '/^=========/,/^=========/!d;/^=========/d' \ | ||
$(if $(filter yes,$(have-hash-style)), \ | ||
-e 's/^.*\.gnu\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ | ||
-e '/^[ ]*\.hash[ ]*:.*$$/{h;d;}' \ | ||
-e '/DATA_SEGMENT_ALIGN/{H;g}' \ | ||
, \ | ||
-e 's/^.*\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ | ||
- ) \ | ||
- -e 's/^.*\*(\.dynbss).*$$/& \ | ||
+ ) | ||
+shlib-lds-dynbss = -e 's/^.*\*(\.dynbss).*$$/& \ | ||
PROVIDE(__start___libc_freeres_ptrs = .); \ | ||
*(__libc_freeres_ptrs) \ | ||
- PROVIDE(__stop___libc_freeres_ptrs = .);/'\ | ||
- -e 's@^.*\*(\.jcr).*$$@& \ | ||
+ PROVIDE(__stop___libc_freeres_ptrs = .);/' | ||
+shlib-lds-jcr = -e 's@^.*\*(\.jcr).*$$@& \ | ||
PROVIDE(__start___libc_subfreeres = .);\ | ||
__libc_subfreeres : { *(__libc_subfreeres) }\ | ||
PROVIDE(__stop___libc_subfreeres = .);\ | ||
@@ -538,6 +532,13 @@ | ||
__libc_thread_subfreeres : { *(__libc_thread_subfreeres) }\ | ||
PROVIDE(__stop___libc_thread_subfreeres = .);\ | ||
/DISCARD/ : { *(.gnu.glibc-stub.*) }@' | ||
+$(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules | ||
+ $(LINK.o) -shared -Wl,-O1 \ | ||
+ -nostdlib -nostartfiles \ | ||
+ $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS.so) \ | ||
+ -Wl,--verbose 2>&1 | \ | ||
+ sed > $@T \ | ||
+ $(shlib-lds-hash) $(shlib-lds-dynbss) $(shlib-lds-jcr) | ||
test -s $@T | ||
mv -f $@T $@ | ||
common-generated += shlib.lds |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters