linting

Author: Kyle-Kyle

angrop/chain_builder/mem_writer.py

@@ -158,7 +158,8 @@ def bootstrap(self):
         self._good_mem_write_gadgets = defaultdict(set)
         self._build_mem_change_cache()
 
-    def _solve_byte_pair(self, target, op, badbytes, preferred_init=None):
+    @staticmethod
+    def _solve_byte_pair(target, op, badbytes, preferred_init=None):
         """
         return (init_byte, arg_byte) for a given op if possible
         """
@@ -602,7 +603,8 @@ def _write_to_mem_with_gadget(self, gadget, addr_val, data, preserve_regs):
             raise RopException("the next pc is not in our control!")
         return chain
 
-    def _badbyte_mem_write_plans(self, data_size):
+    @staticmethod
+    def _badbyte_mem_write_plans(data_size):
         """
         generate all plans that have don't have badbytes in the address
         """
@@ -624,8 +626,7 @@ def dfs(plans, total):
 
         # generate plans
         # maybe more filterings here?
-        for p in plans:
-            yield p
+        yield from plans
 
     def _try_write_plan(self, plan, addr, data, preserve_regs, fill_byte):
         preferred_init = ord(fill_byte)
@@ -656,8 +657,8 @@ def _try_write_plan(self, plan, addr, data, preserve_regs, fill_byte):
             except RopException:
                 return None
             ptr += chunk_size
-        else:
-            return chain
+
+        return chain
 
     ##### Main Entrance #####
     def write_to_mem(self, addr, data, preserve_regs=None, fill_byte=b"\xff"):
@@ -687,4 +688,4 @@ def write_to_mem(self, addr, data, preserve_regs=None, fill_byte=b"\xff"):
             chain = self._try_write_plan(plan, addr, data, preserve_regs, fill_byte)
             if chain:
                 return chain
-        raise RopException(f"Cannot build badbyte-free write!")
+        raise RopException("Cannot build badbyte-free write!")

angrop/chain_builder/reg_setter.py

@@ -707,7 +707,9 @@ def _find_add_chain(self, reg, val) -> list[RopGadget|RopBlock]:
         for g1 in concrete_setter_gadgets:
             for g2 in delta_gadgets:
                 init_ast, final_ast = g2.concrete_reg_changes[reg]
-                ast = claripy.algorithm.replace(expr=final_ast, old=init_ast, new=claripy.BVV(g1.concrete_regs[reg], arch_bits))
+                ast = claripy.algorithm.replace(expr=final_ast,
+                                                old=init_ast,
+                                                new=claripy.BVV(g1.concrete_regs[reg], arch_bits))
                 if ast.concrete_value != val.concreted:
                     continue
                 try:

tests/test_badbytes.py

@@ -4,6 +4,7 @@
 
 import angr
 import angrop  # pylint: disable=unused-import
+from angrop.errors import RopException
 
 l = logging.getLogger(__name__)
 
@@ -117,7 +118,6 @@ def test_badbyte_multibyte():
     target = b"\x00\x00\x00\x42"
     chain = rop.write_to_mem(0xdeadbf00, target, fill_byte=b"\xff")
     state = chain.exec()
-    endian = "little" if proj.arch.memory_endness == "Iend_LE" else "big"
     data = state.solver.eval(state.memory.load(0xdeadbf00, len(target)), cast_to=bytes)
     assert data == target
 
@@ -139,8 +139,8 @@ def test_hard_regs_loop():
     rop.set_badbytes([0x00, 0x0A])
     start = time.time()
     try:
-        chain = rop.set_regs(eax=0x4200009a, edx=0xdeadbefc)
-    except angrop.errors.RopException:
+        rop.set_regs(eax=0x4200009a, edx=0xdeadbefc)
+    except RopException:
         pass
 
     # if should take less than 0.1s, but let's be lenient here

tests/test_gadgets.py

@@ -1,8 +1,8 @@
 import os
 
+import claripy
 import angr
 import angrop # pylint: disable=unused-import
-import claripy
 from angrop.rop_gadget import RopGadget, PivotGadget, SyscallGadget
 
 BIN_DIR = os.path.join(os.path.dirname(__file__), "..", "..", "binaries")