Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Preprocessing] Stack canary check found in __stack_chk_fail #244

Merged
merged 8 commits into from
Aug 14, 2023
Merged

[Preprocessing] Stack canary check found in __stack_chk_fail #244

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9a04811
Create draft PR for #243
0x6e62 Jun 7, 2023
1ad57b5
fixed the check for stack canaries detecting the function __stack_chk…
0x6e62 Jun 7, 2023
2eb527c
added a check for the stack canary method name
0x6e62 Jun 13, 2023
7f781ea
isort
0x6e62 Jun 13, 2023
a748b6b
removed unnedded imports
0x6e62 Jun 13, 2023
e37860c
Merge branch 'main' into issue-243-_Preprocessing_Stack_canary_check_…
Aug 4, 2023
3e87138
Merge branch 'main' into issue-243-_Preprocessing_Stack_canary_check_…
ebehner Aug 9, 2023
f414f62
Merge branch 'main' into issue-243-_Preprocessing_Stack_canary_check_…
0x6e62 Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions decompiler/pipeline/preprocessing/remove_stack_canary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class RemoveStackCanary(PipelineStage):
STACK_FAIL_STR = "__stack_chk_fail"

def run(self, task: DecompilerTask):
if task.options.getboolean(f"{self.name}.remove_canary", fallback=False):
if task.options.getboolean(f"{self.name}.remove_canary", fallback=False) and task.name != self.STACK_FAIL_STR:
self._cfg = task.graph
for fail_node in list(self._contains_stack_check_fail()):
self._patch_canary(fail_node)
Expand All @@ -36,10 +36,7 @@ def _is_stack_chk_fail(self, node: BasicBlock) -> bool:
"""
Check if node contains call to __stack_chk_fail
"""
for instr in [str(i) for i in node.instructions]:
if self.STACK_FAIL_STR in instr:
return True
return False
return any(self.STACK_FAIL_STR in str(inst) for inst in node.instructions)

def _patch_canary(self, node: BasicBlock):
"""
Expand Down
Loading