jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

ARM: recognize R_ARM_CALL and R_ARM_JUMP24 as equivalent to R_ARM_PC24

Browse Source 
modified:   linker.cpp
This commit is contained in:
John Reiser
2018-01-12 08:42:34 -08:00
parent 900926c0ed
commit f3a7620ae8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/linker.cpp
+6 -2
View File
@@ -594,7 +594,9 @@ void ElfLinkerAMD64::relocate1(const Relocation *rel, upx_byte *location, upx_ui
void ElfLinkerArmBE::relocate1(const Relocation *rel, upx_byte *location, upx_uint64_t value, void ElfLinkerArmBE::relocate1(const Relocation *rel, upx_byte *location, upx_uint64_t value,
const char *type) { const char *type) {
if (strcmp(type, "R_ARM_PC24") == 0) { if (!strcmp(type, "R_ARM_PC24")
|| !strcmp(type, "R_ARM_CALL")
|| !strcmp(type, "R_ARM_JUMP24")) {
value -= rel->section->offset + rel->offset; value -= rel->section->offset + rel->offset;
set_be24(1 + location, get_be24(1 + location) + value / 4); set_be24(1 + location, get_be24(1 + location) + value / 4);
} else if (strcmp(type, "R_ARM_ABS32") == 0) { } else if (strcmp(type, "R_ARM_ABS32") == 0) {
@@ -618,7 +620,9 @@ void ElfLinkerArmBE::relocate1(const Relocation *rel, upx_byte *location, upx_ui
void ElfLinkerArmLE::relocate1(const Relocation *rel, upx_byte *location, upx_uint64_t value, void ElfLinkerArmLE::relocate1(const Relocation *rel, upx_byte *location, upx_uint64_t value,
const char *type) { const char *type) {
if (strcmp(type, "R_ARM_PC24") == 0) { if (!strcmp(type, "R_ARM_PC24")
|| !strcmp(type, "R_ARM_CALL")
|| !strcmp(type, "R_ARM_JUMP24")) {
value -= rel->section->offset + rel->offset; value -= rel->section->offset + rel->offset;
set_le24(location, get_le24(location) + value / 4); set_le24(location, get_le24(location) + value / 4);
} else if (strcmp(type, "R_ARM_ABS32") == 0) { } else if (strcmp(type, "R_ARM_ABS32") == 0) {