Skip to content

Update cfg_utils.detect_syscall_wrapper. #65

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

Merged
ltfish merged 1 commit into from
Jan 13, 2026
Merged

Update cfg_utils.detect_syscall_wrapper. #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 10 additions & 8 deletions patcherex/cfg_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def check_first_instruction(instr):
return None

try:
succ = ff.startpoint.successors()
outedges = ff.transition_graph.out_edges(ff.startpoint, data=True)
except networkx.NetworkXError:
return None
ends = ff.endpoints
Expand All @@ -90,19 +90,21 @@ def check_first_instruction(instr):
return None

if syscall_number == 1:
if len(succ) == 1:
bb1 = succ[0]
if hasattr(bb1,"is_syscall") and bb1.is_syscall:
if len(outedges) == 1:
edge_data = list(outedges)[0][-1]
if edge_data.get("type") == "syscall":
return syscall_number
return None
else:
if not is_sane_function(ff):
return None
if len(succ) == 2:
bb1,bb2 = succ
if hasattr(bb1,"is_syscall") and bb1.is_syscall:
if len(outedges) == 2:
outedges = list(outedges)
_, bb1, data1 = outedges[0]
_, bb2, data2 = outedges[1]
if data1.get("type") == "syscall":
ebb = bb2
elif hasattr(bb2,"is_syscall") and bb2.is_syscall:
elif data2.get("type") == "syscall":
ebb = bb1
else:
ebb= None
Expand Down
4 changes: 2 additions & 2 deletions tests/test_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ def test_detect_syscall_wrapper():
syscall_wrappers = set([(ff.addr,cfg_utils.detect_syscall_wrapper(backend,ff)) \
for ff in cfg.functions.values() if cfg_utils.detect_syscall_wrapper(backend,ff)!=None])
print("syscall wrappers in CROMU_00071:")
print(map(lambda x:(hex(x[0]),x[1]),syscall_wrappers))
print(list(map(lambda x:(hex(x[0]),x[1]),syscall_wrappers)))
assert syscall_wrappers == legitimate_syscall_wrappers

filepath = os.path.join(bin_location, "CROMU_00070")
Expand All @@ -280,7 +280,7 @@ def test_detect_syscall_wrapper():
syscall_wrappers = set([(ff.addr,cfg_utils.detect_syscall_wrapper(backend,ff)) \
for ff in cfg.functions.values() if cfg_utils.detect_syscall_wrapper(backend,ff)!=None])
print("syscall wrappers in CROMU_00070:")
print(map(lambda x:(hex(x[0]),x[1]),syscall_wrappers))
print(list(map(lambda x:(hex(x[0]),x[1]),syscall_wrappers)))
assert syscall_wrappers == legitimate_syscall_wrappers


Expand Down
Loading