aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2013-02-12 05:08:21 -0600
committerRoss Burton <ross.burton@intel.com>2013-04-23 10:39:50 +0100
commit4142f6f9392fdd919488151170fb088d4113e0f2 (patch)
tree369dc29081ff5c7f259d3de3a0a84f1843b70ea2
parent9c10356bde6d303d84daadb8c1170e08e774f5af (diff)
downloadopenembedded-core-4142f6f9392fdd919488151170fb088d4113e0f2.zip
openembedded-core-4142f6f9392fdd919488151170fb088d4113e0f2.tar.gz
openembedded-core-4142f6f9392fdd919488151170fb088d4113e0f2.tar.bz2
relocate_sdk.py: Fix corruption of sdk binaries
There are two cases of corruption that the relocate_sdk.py was not correctly dealing with. 1) SDK Extras should be left alone Extra external binaries included in an SDK that were linked against the host's version of /usr/lib/ld-so.so should not get a relocation applied. In the case that was discovered these were LSB compliant binaries that already worked on many hosts. 2) If the interp section is too small generate an error In the case of the qemu user code, it was using its own .ld file to link the executables which overrides the default in the nativesdk binutils. This generated host executables which had a interp section that was too small to relocate. Now the relocate_sdk.py will print an error and continue on such that the error can be fixed by a developer without having to do the difficult task of debugging why it is crashing or not loading correctly. Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/relocate_sdk.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/scripts/relocate_sdk.py b/scripts/relocate_sdk.py
index 74bb7a5..45d2c24 100755
--- a/scripts/relocate_sdk.py
+++ b/scripts/relocate_sdk.py
@@ -66,7 +66,7 @@ def parse_elf_header():
e_ehsize, e_phentsize, e_phnum, e_shentsize, e_shnum, e_shstrndx =\
hdr_struct.unpack(elf_header[16:hdr_size])
-def change_interpreter():
+def change_interpreter(elf_file_name):
if arch == 32:
ph_struct = struct.Struct("<IIIIIIII")
else:
@@ -89,7 +89,16 @@ def change_interpreter():
if p_type == 3:
# PT_INTERP section
f.seek(p_offset)
+ # External SDKs with mixed pre-compiled binaries should not get
+ # relocated so look for some variant of /lib
+ fname = f.read(11)
+ if fname.startswith("/lib/") or fname.startswith("/lib64/") or fname.startswith("/lib32/") or fname.startswith("/usr/lib32/") or fname.startswith("/usr/lib32/") or fname.startswith("/usr/lib64/"):
+ break
+ if (len(new_dl_path) >= p_filesz):
+ print "ERROR: could not relocate %s, interp size = %i and %i is needed." % (elf_file_name, p_memsz, len(new_dl_path) + 1)
+ break
dl_path = new_dl_path + "\0" * (p_filesz - len(new_dl_path))
+ f.seek(p_offset)
f.write(dl_path)
break
@@ -199,7 +208,7 @@ for e in executables_list:
arch = get_arch()
if arch:
parse_elf_header()
- change_interpreter()
+ change_interpreter(e)
change_dl_sysdirs()
""" change permissions back """