From 4629a2e842a9e07ea366a3fd731f3c21bdc5afdf Mon Sep 17 00:00:00 2001 From: Jeremiah Orians Date: Mon, 5 Nov 2018 19:45:15 -0500 Subject: [PATCH] Fixed Linux 4.17 regression --- CHANGELOG.org | 1 + test/common_x86/ELF-i386-debug.hex2 | 7 +++++-- test/test.answers | 10 +++++----- test/test22/hello.sh | 2 +- test/test22/proof.answer | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index b6ecc83..e472178 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -30,6 +30,7 @@ Fixed typo in file headers Fixed version number to reflect current version Thanks to akkartik several documentation issues were identified and fixed Corrected missed license headers +Fix regression caused by Linux 4.17 ** Removed diff --git a/test/common_x86/ELF-i386-debug.hex2 b/test/common_x86/ELF-i386-debug.hex2 index aa09a73..9ba9b3b 100644 --- a/test/common_x86/ELF-i386-debug.hex2 +++ b/test/common_x86/ELF-i386-debug.hex2 @@ -76,8 +76,11 @@ 01 00 00 00 # ph_align # @60 -:ELF_program_header__data -01 00 00 00 # ph_type: PT-LOAD = 1 +#:ELF_program_header__data # NOT USED + # FIXME: linux 4.17 does not allow this overlap + # Uhuuh, elf segment at 0000000001000000 + # requested but the memory is mapped already +00 00 00 00 # ph_type: PT-LOAD = 1 => no load 00 00 00 00 # ph_offset &ELF_base # ph_vaddr &ELF_base # ph_physaddr diff --git a/test/test.answers b/test/test.answers index 6bb78f3..14e69a5 100644 --- a/test/test.answers +++ b/test/test.answers @@ -9,7 +9,7 @@ a9a3e332d13ded5f80d7431f8717f26527b3722b33ea57760a9a5723dffc099c test/results/t f1c01feb865c4d552033186d9ce50dd39468a7e8aebf762886c13ad3e03b5011 test/results/test08-binary 3b39e72f3de90ed690adfaf6145af46157cef2ec5e72867ac577fa27a0229894 test/results/test09-binary 020e86020819cc4963e6185b22e534fcf8306b6cb116f12643f254a24688ff0a test/results/test10-binary -db41db8bc1dc2f94367c41c33d9438634d75994f79a46296bb8907905a64c013 test/results/test100-binary +a9708d6e40a4c00d7afe1163a9d149d46525071e9b8a0f283d82f76b443da182 test/results/test100-binary 3fd11bad4a426ce1ff8fd9c6d7d2b943effae9f3f5740b7376e426e9b0555851 test/results/test11-binary f98ab8e4bb35580e0dde96126d7a56aff66bda208d02c8d89390b40d6cff591c test/results/test12-binary 5051ffca2615144419f8ec1a5d4999486ae81e7781428f59e47e866af97cef92 test/results/test13-binary @@ -20,8 +20,8 @@ d70e072f4f1f077d10ff65e9216ca8b423b996e35d68d208025db7a78b062f50 test/results/t 8de7384c4633b1d5c60bbbb298d7f4b738e52fbc266ef4ef9a48b3cb995e3176 test/results/test18-binary b0d7982de3f257d6a5b51ad356c1aa09f24b8a69d862a90f41aef7dc83ec3b2f test/results/test19-binary 365c96fb8368710d620a76facd6bebcdeeb6f6d30ceaf0a6f1567fc3fcbe9b54 test/results/test20-binary -abb4d9272a262c4bf77d9cbb714cbb8ce16841a128c670394f60cb817ebe7727 test/results/test21-binary -24a14bd0641cdbcf49b69a71c80c00fb4f0c42c5ed72f7b44e5119ad1f22d533 test/results/test22-binary -dd9081cb6eb908e8a727b05e2fc65efe01e5c33221eee9a70565808a97c7b294 test/results/test23-binary -6fb0c0db1732038f945172ef05c33c976396baf86571b1169a3af02e850be0d5 test/results/test24-binary +3c7654eb26247e5f0460dad9e539220a68078cd8c56aae8457b5a97dc6eab892 test/results/test21-binary +b339c77f2b62f8fc6fa4da699dec4c16ad5f6f565c5cd6b133e3b5c4ea5c84e1 test/results/test22-binary +aedaa40380b16892578958e1c8454f4901ad77c7ee2511fad6c27012c08a6cc7 test/results/test23-binary +c080413cdb713618896a73b834fb96ce8dd2c2176a226c0713d9a729bd1aa7f9 test/results/test24-binary 140af7fb3ef89d84b21bd3fe69f0d3260650ec0467c0ffadf9268fad573a397f test/results/test99-binary diff --git a/test/test22/hello.sh b/test/test22/hello.sh index 69db2e8..4c4eaf2 100755 --- a/test/test22/hello.sh +++ b/test/test22/hello.sh @@ -60,7 +60,7 @@ then [ "$out" = "hex2 0.3" ] || exit 6 # Verify that the resulting file works - ./test/results/test22-binary -f test/common_x86/ELF-i386-debug.hex2 \ + ./test/results/test22-binary -f test/common_x86/ELF-i386.hex2 \ -f test/test22/test.hex2 \ --LittleEndian \ --Architecture 1 \ diff --git a/test/test22/proof.answer b/test/test22/proof.answer index 666153c..3f5b284 100644 --- a/test/test22/proof.answer +++ b/test/test22/proof.answer @@ -1 +1 @@ -29e782e265b0c2cb807ac94d15336be7785ddb9ebc4b175b5ef9241812a24235 test/test22/proof +16e455e2c1f7f5a1fd0cd84e37b289acb6cb943e7e82071d134c6800ae056fba test/test22/proof