Ghidra is a software reverse engineering (SRE) framework
GP-5846 Corrected ELF PowerPC 64-bit relocation processing bugs affecting ELFv2 use and R_PPC64_JMP_SLOT relocation
ghidra1006bd8d4236a
diff --git a/Ghidra/Processors/PowerPC/src/main/java/ghidra/app/util/bin/format/elf/extend/PowerPC64_ElfExtension.java b/Ghidra/Processors/PowerPC/src/main/java/ghidra/app/util/bin/format/elf/extend/PowerPC64_ElfExtension.javaindex 309c831db1..94dcb78471 100644--- a/Ghidra/Processors/PowerPC/src/main/java/ghidra/app/util/bin/format/elf/extend/PowerPC64_ElfExtension.java+++ b/Ghidra/Processors/PowerPC/src/main/java/ghidra/app/util/bin/format/elf/extend/PowerPC64_ElfExtension.java@@ -522,6 +522,7 @@ public class PowerPC64_ElfExtension extends ElfExtension {Function f = elfLoadHelper.createOneByteFunction(name, address, false);if (f != null && localFunction != null) {f.setThunkedFunction(localFunction);+ elfLoadHelper.setElfSymbolAddress(elfSymbol, address);return null; // symbol creation handled}@@ -543,6 +544,11 @@ public class PowerPC64_ElfExtension extends ElfExtension {if (elf.e_machine() != ElfConstants.EM_PPC64) {return 0;}++ if (elf.getSection(".opd") != null) {+ return 1;+ }+// TODO: While the e_flags should indicate the use of function descriptors, this// may not be set reliably. The presence of the .opd section is another// indicator but could be missing if sections have been stripped.diff --git a/Ghidra/Processors/PowerPC/src/main/java/ghidra/app/util/bin/format/elf/relocation/PowerPC64_ElfRelocationHandler.java b/Ghidra/Processors/PowerPC/src/main/java/ghidra/app/util/bin/format/elf/relocation/PowerPC64_ElfRelocationHandler.javaindex f68f9740c0..9b640d7fe9 100644--- a/Ghidra/Processors/PowerPC/src/main/java/ghidra/app/util/bin/format/elf/relocation/PowerPC64_ElfRelocationHandler.java+++ b/Ghidra/Processors/PowerPC/src/main/java/ghidra/app/util/bin/format/elf/relocation/PowerPC64_ElfRelocationHandler.java@@ -4,9 +4,9 @@* Licensed under the Apache License, Version 2.0 (the "License");* you may not use this file except in compliance with the License.* You may obtain a copy of the License at- *+ ** http://www.apache.org/licenses/LICENSE-2.0- *+ ** Unless required by applicable law or agreed to in writing, software* distributed under the License is distributed on an "AS IS" BASIS,* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.@@ -215,27 +215,34 @@ public class PowerPC64_ElfRelocationHandlermemory.setInt(relocationAddress, newValue);break;case R_PPC64_JMP_SLOT:- // TODO: do we need option to allow function descriptor- // use - or not? The EF_PPC64_ABI in e_flags is not reliable.- Address functionDescriptorAddr = relocationAddress.getNewAddress(symbolValue);- MemoryBlock block = memory.getBlock(functionDescriptorAddr);+ MemoryBlock block = memory.getBlock(symbolAddr);if (block == null) {throw new MemoryAccessException(- "Function descriptor not found at: " + functionDescriptorAddr);+ "Relocation symbol not found in memory: " + symbolAddr);}+if (MemoryBlock.EXTERNAL_BLOCK_NAME.equals(block.getName())) {// If symbol is in EXTERNAL block, we don't have descriptor entry;// just fill-in first slot with EXTERNAL addressmemory.setLong(relocationAddress, symbolValue);byteLength = 8;+ break;}- else {++ if (PowerPC64_ElfExtension+ .getPpc64ABIVersion(elfRelocationContext.getElfHeader()) == 1) {+ // ABI ELFv1 (used by big-endian PPC64) expected to copy full function descriptor+ // into .got.plt section where symbolAddr refers to function descriptor// Copy function descriptor data- byte[] bytes = new byte[24]; // TODO: can descriptor size vary ?- memory.getBytes(functionDescriptorAddr, bytes);+ byte[] bytes = new byte[24];+ memory.getBytes(symbolAddr, bytes);memory.setBytes(relocationAddress, bytes);byteLength = bytes.length;}+ else {+ memory.setLong(relocationAddress, symbolValue);+ byteLength = 8;+ }break;case R_PPC64_UADDR32:newValue = (int) (symbolValue + addend);