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

Avoid creating of several long lists in ROP.__init__ #31

Merged
merged 1 commit into from
Aug 31, 2020
Merged

Avoid creating of several long lists in ROP.__init__ #31

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
20 changes: 17 additions & 3 deletions angrop/rop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def __init__(self, only_check_near_rets=True, max_block_size=20, max_sym_mem_acc
self.badbytes = []
self.roparg_filler = None

num_to_check = len(list(self._addresses_to_check()))
num_to_check = self._num_addresses_to_check()
# fast mode
if fast_mode is None:
if num_to_check > 20000:
Expand All @@ -96,7 +96,8 @@ def __init__(self, only_check_near_rets=True, max_block_size=20, max_sym_mem_acc
if self._fast_mode:
self._max_block_size = 12
self._max_sym_mem_accesses = 1
num_to_check = len(list(self._addresses_to_check()))
# Recalculate num addresses to check based on fast_mode settings
num_to_check = self._num_addresses_to_check()

l.info("There are %d addresses within %d bytes of a ret",
num_to_check, self._max_block_size)
Expand Down Expand Up @@ -277,7 +278,7 @@ def _block_has_ip_relative(self, addr, bl):
return len(filtered_diffs) > 0

def _addresses_to_check_with_caching(self, show_progress=True):
num_addrs = len(list(self._addresses_to_check()))
num_addrs = self._num_addresses_to_check()
widgets = ['ROP: ', progressbar.Percentage(), ' ',
progressbar.Bar(marker=progressbar.RotatingMarker()),
' ', progressbar.ETA(), ' ', progressbar.FileTransferSpeed()]
Expand Down Expand Up @@ -334,6 +335,19 @@ def _addresses_to_check(self):
for addr in range(segment.min_addr, segment.max_addr):
yield addr

def _num_addresses_to_check(self):
if self._only_check_near_rets:
# TODO: This could probably be optimized further by fewer segments checks (i.e. iterating for segments and
# adding ranges instead of incrementing, instead of calling _addressses_to_check) although this is still a
# significant improvement.
return sum(1 for _ in self._addresses_to_check())
else:
num = 0
for segment in self.project.loader.main_object.segments:
if segment.is_executable:
num += (segment.max_addr - segment.min_addr)
return num

def _get_ret_locations(self):
"""
:return: all the locations in the binary with a ret instruction
Expand Down