Fix ELF R_X86_64_PLT32 relocation entries patching ##bin #17587
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Correctly get the address of the PLT entry for a symbol. If the symbol was not yet added to the .got.r2 section, then take the first available address (vaddr), otherwise retrieve it from the hashtable.
ret2libc
force-pushed
the
elf-x86-64-plt32
branch
from
7791974
to
0fca53f
Compare
|
Ok apparently it is not working well yet. Moving it back to draft :( |
ret2libc
commented
Sep 4, 2020
| @@ -1512,13 +1512,6 @@ static int handleMidFlags(RCore *core, RDisasmState *ds, bool print) { | |||
| } else if (!strncmp (fi->name, "str.", 4)) { | |||
| ds->midflags = R_MIDFLAGS_REALIGN; | |||
| } else if (!strncmp (fi->name, "reloc.", 6)) { | |||
| if (print) { | |||
There was a problem hiding this comment.
Not only it seems unnecessary because, as written in the comment, there is already a comment for relocations. But it is also wrong in some cases.
ret2libc
commented
Sep 4, 2020
| RBinReloc *rel; | ||
| rel = r_core_getreloc (ds->core, ds->analop.addr, ds->analop.size); | ||
| RBinReloc *rel = NULL; | ||
| if (!ds->core->bin->is_reloc_patched) { |
There was a problem hiding this comment.
@GustavoLCR I saw this was done by you in #14587 to correctly show relocations when -e io.cache=true is not used. However, when that's used this causes issues because the relocations AFAIK change positions.
XVilka
approved these changes
Sep 8, 2020
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Your checklist for this pull request
Detailed description
See issue, it's well described.
Test plan
See radareorg/radare2-testbins#49.
Closing issues
Closes #17583