Fix insane class ELF bitsize checks
cover Fix insane class ELF bitsize checks
The insane class was not checking the ELF bitsize, in fact if it wasn't correct it was skipping all of the QA checks!
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: mhatle/insane
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/insane
Thanks,
Mark Hatle <[email protected]>
---
Mark Hatle (1):
insane.bbclass: Fix ELF bitsize comparison
meta/classes/insane.bbclass | 84 ++++++++++++++++++++++--------------------- meta/lib/oe/qa.py | 21 +++++++++-- 2 files changed, 60 insertions(+), 45 deletions(-)
Signature · 1 line
1.7.4
PATCH 1/1 insane.bbclass: Fix ELF bitsize comparison
Fix the way the ELF size is compared to ensure that incorrectly sized ELF binaries are captured during the file scan.
lib/oe/qa.py is changed to accept a bitsize as a parameter. Instead of previously defining true/false, it now takes "0" undefined, "32" 32-bit, and "64" 64-bit as the size argument. This allows us to preserve existing behavior of only loading one ELF type, while allowing the function to be able to discover the size on it's own.
Signed-off-by Mark Hatle <[email protected]>
--- meta/classes/insane.bbclass | 84 ++++++++++++++++++++++--------------------- meta/lib/oe/qa.py | 21 +++++++++-- 2 files changed, 60 insertions(+), 45 deletions(-)
meta/classes/insane.bbclass +43 -41
@@ -32,58 +32,58 @@ PACKAGEFUNCS += " do_package_qa " def package_qa_get_machine_dict(): return { "darwin9" : { - "arm" : (40, 0, 0, True, True), + "arm" : (40, 0, 0, True, 32), }, "linux" : { - "arm" : (40, 97, 0, True, True), - "armeb": (40, 97, 0, False, True), - "powerpc": (20, 0, 0, False, True), - "i386": ( 3, 0, 0, True, True), - "i486": ( 3, 0, 0, True, True), - "i586": ( 3, 0, 0, True, True), - "i686": ( 3, 0, 0, True, True), - "x86_64": (62, 0, 0, True, False), - "ia64": (50, 0, 0, True, False), - "alpha": (36902, 0, 0, True, False), - "hppa": (15, 3, 0, False, True), - "m68k": ( 4, 0, 0, False, True), - "mips": ( 8, 0, 0, False, True), - "mipsel": ( 8, 0, 0, True, True), - "s390": (22, 0, 0, False, True), - "sh4": (42, 0, 0, True, True), - "sparc": ( 2, 0, 0, False, True), + "arm" : (40, 97, 0, True, 32), + "armeb": (40, 97, 0, False, 32), + "powerpc": (20, 0, 0, False, 32), + "i386": ( 3, 0, 0, True, 32), + "i486": ( 3, 0, 0, True, 32), + "i586": ( 3, 0, 0, True, 32), + "i686": ( 3, 0, 0, True, 32), + "x86_64": (62, 0, 0, True, 64), + "ia64": (50, 0, 0, True, 64), + "alpha": (36902, 0, 0, True, 64), + "hppa": (15, 3, 0, False, 32), + "m68k": ( 4, 0, 0, False, 32), + "mips": ( 8, 0, 0, False, 32), + "mipsel": ( 8, 0, 0, True, 32), + "s390": (22, 0, 0, False, 32), + "sh4": (42, 0, 0, True, 32), + "sparc": ( 2, 0, 0, False, 32), }, "linux-uclibc" : { - "arm" : ( 40, 97, 0, True, True), - "armeb": ( 40, 97, 0, False, True), - "powerpc": ( 20, 0, 0, False, True), - "i386": ( 3, 0, 0, True, True), - "i486": ( 3, 0, 0, True, True), - "i586": ( 3, 0, 0, True, True), - "i686": ( 3, 0, 0, True, True), - "x86_64": ( 62, 0, 0, True, False), - "mips": ( 8, 0, 0, False, True), - "mipsel": ( 8, 0, 0, True, True), - "avr32": (6317, 0, 0, False, True), - "sh4": (42, 0, 0, True, True), + "arm" : ( 40, 97, 0, True, 32), + "armeb": ( 40, 97, 0, False, 32), + "powerpc": ( 20, 0, 0, False, 32), + "i386": ( 3, 0, 0, True, 32), + "i486": ( 3, 0, 0, True, 32), + "i586": ( 3, 0, 0, True, 32), + "i686": ( 3, 0, 0, True, 32), + "x86_64": ( 62, 0, 0, True, 64), + "mips": ( 8, 0, 0, False, 32), + "mipsel": ( 8, 0, 0, True, 32), + "avr32": (6317, 0, 0, False, 32), + "sh4": (42, 0, 0, True, 32), }, "uclinux-uclibc" : { - "bfin": ( 106, 0, 0, True, True), + "bfin": ( 106, 0, 0, True, 32), }, "linux-gnueabi" : { - "arm" : (40, 0, 0, True, True), - "armeb" : (40, 0, 0, False, True), + "arm" : (40, 0, 0, True, 32), + "armeb" : (40, 0, 0, False, 32), }, "linux-uclibcgnueabi" : { - "arm" : (40, 0, 0, True, True), - "armeb" : (40, 0, 0, False, True), + "arm" : (40, 0, 0, True, 32), + "armeb" : (40, 0, 0, False, 32), }, "linux-gnuspe" : { - "powerpc": (20, 0, 0, False, True), + "powerpc": (20, 0, 0, False, 32), }, "linux-uclibcspe" : { - "powerpc": (20, 0, 0, False, True), + "powerpc": (20, 0, 0, False, 32), }, }
@@ -243,7 +243,7 @@ def package_qa_check_arch(path,name,d, elf): return True #if this will throw an exception, then fix the dict above - (machine, osabi, abiversion, littleendian, bits32) \ + (machine, osabi, abiversion, littleendian, bits) \ = package_qa_get_machine_dict()[target_os][target_arch] # Check the architecture and endiannes of the binary
@@ -251,6 +251,10 @@ def package_qa_check_arch(path,name,d, elf): error_msg = "Architecture did not match (%d to %d) on %s" % \ (machine, elf.machine(), package_qa_clean_path(path,d)) sane = package_qa_handle_error(4, error_msg, name, path, d) + elif not bits == elf.abiSize(): + error_msg = "Bit size did not match (%d to %d) on %s" % \ + (bits, elf.abiSize(), package_qa_clean_path(path,d)) + sane = package_qa_handle_error(4, error_msg, name, path, d) elif not littleendian == elf.isLittleEndian(): error_msg = "Endiannes did not match (%d to %d) on %s" % \ (littleendian, elf.isLittleEndian(), package_qa_clean_path(path,d))
@@ -445,14 +449,12 @@ def package_qa_walk(path, funcs, package,d): #if this will throw an exception, then fix the dict above target_os = bb.data.getVar('TARGET_OS', d, True) target_arch = bb.data.getVar('TARGET_ARCH', d, True) - (machine, osabi, abiversion, littleendian, bits32) \ - = package_qa_get_machine_dict()[target_os][target_arch] sane = True for root, dirs, files in os.walk(path): for file in files: path = os.path.join(root,file) - elf = oe.qa.ELFFile(path, bits32) + elf = oe.qa.ELFFile(path) try: elf.open() except:
meta/lib/oe/qa.py +17 -4
@@ -25,9 +25,9 @@ class ELFFile: #print "'%x','%x' %s" % (ord(expectation), ord(result), self.name) raise Exception("This does not work as expected") - def __init__(self, name, bits32): + def __init__(self, name, bits = 0): self.name = name - self.bits32 = bits32 + self.bits = bits def open(self): self.file = file(self.name, "r")
@@ -38,10 +38,20 @@ class ELFFile: self.my_assert(self.data[1], 'E') self.my_assert(self.data[2], 'L') self.my_assert(self.data[3], 'F') - if self.bits32 : + if self.bits == 0: + if self.data[ELFFile.EI_CLASS] == chr(ELFFile.ELFCLASS32): + self.bits == 32 + elif self.data[ELFFile.EI_CLASS] == chr(ELFFile.ELFCLASS64): + self.bits == 64 + else: + # Not 32-bit or 64.. lets assert + raise Exception("ELF but not 32 or 64 bit.") + elif self.bits == 32: self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS32)) - else: + elif self.bits == 64: self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS64)) + else: + raise Exception("Must specify unknown, 32 or 64 bit size.") self.my_assert(self.data[ELFFile.EI_VERSION], chr(ELFFile.EV_CURRENT) ) self.sex = self.data[ELFFile.EI_DATA]
@@ -60,6 +70,9 @@ class ELFFile: def abiVersion(self): return ord(self.data[ELFFile.EI_ABIVERSION]) + def abiSize(self): + return self.bits + def isLittleEndian(self): return self.sex == "<"
Signature · 1 line
1.7.4
Saul Wold
AppliedQuoted 12 lines · Mark Hatle
The insane class was not checking the ELF bitsize, in fact if it wasn't correct it was skipping all of the QA checks!
Pull URL:
git://git.pokylinux.org/poky-contrib.git
Branch: mhatle/insane
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/insaneThanks,
Mark Hatle<[email protected]>
---
Quoted 7 lines
Mark Hatle (1):
insane.bbclass: Fix ELF bitsize comparisonmeta/classes/insane.bbclass | 84 ++++++++++++++++++++++--------------------- meta/lib/oe/qa.py | 21 +++++++++-- 2 files changed, 60 insertions(+), 45 deletions(-)
Merged into Bernard, OE-Core and Master
Thanks
Sau!