angr 9.2.80__py3-none-win_amd64.whl → 9.2.81__py3-none-win_amd64.whl

angr/__init__.py

@@ -1,7 +1,7 @@
 # pylint: disable=wildcard-import
 # pylint: disable=wrong-import-position
 
-__version__ = "9.2.80"
+__version__ = "9.2.81"
 
 if bytes is str:
     raise Exception(

angr/analyses/propagator/engine_vex.py

@@ -7,7 +7,7 @@ import archinfo
 
 from angr.knowledge_plugins.propagations.states import RegisterAnnotation, RegisterComparisonAnnotation
 from ...engines.light import SimEngineLightVEXMixin
-from ...calling_conventions import DEFAULT_CC, default_cc, SimRegArg
+from ...calling_conventions import DEFAULT_CC, SYSCALL_CC, default_cc, SimRegArg
 from .values import Top, Bottom
 from .engine_base import SimEnginePropagatorBase
 from .top_checker_mixin import TopCheckerMixin
@@ -31,18 +31,18 @@ class SimEnginePropagatorVEX(
     # Private methods
     #
 
-    def _process(self, state, successors, block=None, whitelist=None, **kwargs):  # pylint:disable=arguments-differ
-        super()._process(state, successors, block=block, whitelist=whitelist, **kwargs)
-
+    def _process_block_end(self):
+        super()._process_block_end()
         if self.block.vex.jumpkind == "Ijk_Call":
             if self.arch.call_pushes_ret:
                 # pop ret from the stack
                 sp_offset = self.arch.sp_offset
-                sp_value = state.load_register(sp_offset, self.arch.bytes)
+                sp_value = self.state.load_register(sp_offset, self.arch.bytes)
                 if sp_value is not None:
-                    state.store_register(sp_offset, self.arch.bytes, sp_value + self.arch.bytes)
+                    self.state.store_register(sp_offset, self.arch.bytes, sp_value + self.arch.bytes)
 
-        return state
+        if self.block.vex.jumpkind == "Ijk_Call" or self.block.vex.jumpkind.startswith("Ijk_Sys"):
+            self._handle_return_from_call()
 
     def _allow_loading(self, addr, size):
         if type(addr) in (Top, Bottom):
@@ -110,9 +110,16 @@ class SimEnginePropagatorVEX(
                     #   ret
                     ebx_offset = self.arch.registers["ebx"][0]
                     self.state.store_register(ebx_offset, 4, claripy.BVV(self.block.addr + self.block.size, 32))
-        if self.arch.name in DEFAULT_CC:
+
+    def _handle_return_from_call(self):
+        # FIXME: Handle the specific function calling convention when known
+        syscall = self.block.vex.jumpkind.startswith("Ijk_Sys")
+        cc_map = SYSCALL_CC if syscall else DEFAULT_CC
+        if self.arch.name in cc_map:
             cc = default_cc(
-                self.arch.name, platform=self.project.simos.name if self.project.simos is not None else None
+                self.arch.name,
+                platform=self.project.simos.name if self.project.simos is not None else None,
+                syscall=syscall,
             )  # don't instantiate the class for speed
             if isinstance(cc.RETURN_VAL, SimRegArg):
                 offset, size = self.arch.registers[cc.RETURN_VAL.reg_name]

angr/analyses/reaching_definitions/rd_state.py

@@ -566,19 +566,19 @@ class ReachingDefinitionsState:
     @overload
     def deref(
         self,
-        pointer: Union[MultiValues, Atom, Definition, Iterable[Atom], Iterable[Definition]],
+        pointer: Union[int, claripy.ast.bv.BV, HeapAddress, SpOffset],
         size: Union[int, DerefSize],
         endness: str = ...,
-    ) -> Set[MemoryLocation]:
+    ) -> Optional[MemoryLocation]:
         ...
 
     @overload
     def deref(
         self,
-        pointer: Union[int, claripy.ast.BV, HeapAddress, SpOffset],
+        pointer: Union[MultiValues, Atom, Definition, Iterable[Atom], Iterable[Definition]],
         size: Union[int, DerefSize],
         endness: str = ...,
-    ) -> Optional[MemoryLocation]:
+    ) -> Set[MemoryLocation]:
         ...
 
     def deref(

angr/calling_conventions.py

@@ -1592,6 +1592,7 @@ class SimCCAMD64LinuxSyscall(SimCCSyscall):
     RETURN_VAL = SimRegArg("rax", 8)
     RETURN_ADDR = SimRegArg("ip_at_syscall", 8)
     ARCH = archinfo.ArchAMD64
+    CALLER_SAVED_REGS = ["rax", "rcx", "r11"]
 
     @staticmethod
     def _match(arch, args, sp_delta):  # pylint: disable=unused-argument
@@ -2257,6 +2258,7 @@ def default_cc(  # pylint:disable=unused-argument
     arch: str,
     platform: Optional[str] = "Linux",
     language: Optional[str] = None,
+    syscall: bool = False,
     **kwargs,
 ) -> Optional[Type[SimCC]]:
     """
@@ -2265,6 +2267,7 @@ def default_cc(  # pylint:disable=unused-argument
     :param arch:        The architecture name.
     :param platform:    The platform name (e.g., "Linux" or "Win32").
     :param language:    The programming language name (e.g., "go").
+    :param syscall:     Return syscall convention (True), or normal calling convention (False, default).
     :return:            A default calling convention class if we can find one for the architecture, platform, and
                         language combination, or None if nothing fits.
     """
@@ -2273,20 +2276,21 @@ def default_cc(  # pylint:disable=unused-argument
         platform = "Linux"
 
     default = kwargs.get("default", ...)
+    cc_map = SYSCALL_CC if syscall else DEFAULT_CC
 
-    if arch in DEFAULT_CC:
-        if platform not in DEFAULT_CC[arch]:
+    if arch in cc_map:
+        if platform not in cc_map[arch]:
             if default is not ...:
                 return default
-            if "Linux" in DEFAULT_CC[arch]:
-                return DEFAULT_CC[arch]["Linux"]
-        return DEFAULT_CC[arch][platform]
+            if "Linux" in cc_map[arch]:
+                return cc_map[arch]["Linux"]
+        return cc_map[arch][platform]
 
     alias = unify_arch_name(arch)
-    if alias not in DEFAULT_CC or platform not in DEFAULT_CC[alias]:
+    if alias not in cc_map or platform not in cc_map[alias]:
         if default is not ...:
             return default
-    return DEFAULT_CC[alias][platform]
+    return cc_map[alias][platform]
 
 
 def unify_arch_name(arch: str) -> str:

{angr-9.2.80.dist-info → angr-9.2.81.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: angr
-Version: 9.2.80
+Version: 9.2.81
 Summary: A multi-architecture binary analysis toolkit, with the ability to perform dynamic symbolic execution and various static analyses on binaries
 Home-page: https://github.com/angr/angr
 License: BSD-2-Clause
@@ -17,13 +17,13 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: CppHeaderParser
 Requires-Dist: GitPython
-Requires-Dist: ailment ==9.2.80
-Requires-Dist: archinfo ==9.2.80
+Requires-Dist: ailment ==9.2.81
+Requires-Dist: archinfo ==9.2.81
 Requires-Dist: cachetools
 Requires-Dist: capstone ==5.0.0.post1
 Requires-Dist: cffi >=1.14.0
-Requires-Dist: claripy ==9.2.80
-Requires-Dist: cle ==9.2.80
+Requires-Dist: claripy ==9.2.81
+Requires-Dist: cle ==9.2.81
 Requires-Dist: dpkt
 Requires-Dist: itanium-demangler
 Requires-Dist: mulpyplexer
@@ -32,7 +32,7 @@ Requires-Dist: networkx !=2.8.1,>=2.0
 Requires-Dist: protobuf >=3.19.0
 Requires-Dist: psutil
 Requires-Dist: pycparser >=2.18
-Requires-Dist: pyvex ==9.2.80
+Requires-Dist: pyvex ==9.2.81
 Requires-Dist: rich >=13.1.0
 Requires-Dist: rpyc
 Requires-Dist: sortedcontainers

{angr-9.2.80.dist-info → angr-9.2.81.dist-info}/RECORD

@@ -1,10 +1,10 @@
-angr/__init__.py,sha256=YKGLZGGH4jmUKaEsavWpDSsKfykPCtumRvvjgfG3S6A,3851
+angr/__init__.py,sha256=lx238j_2zUPsGA8g018HSBPT-NqVwE_2BiMSvPLid3k,3851
 angr/__main__.py,sha256=kaO56Te6h73SM94BVtASF00q5QbBbC3eBs9poVc9sVI,1887
 angr/annocfg.py,sha256=dK5JAdN4Ig_jgxTBZeZXwk3kAS4-IQUvE6T02GBZTDQ,10818
 angr/blade.py,sha256=YySrLqj2Y3-td9FJnkjDqYyFvAeGhc5a5lrGoHKOT2A,15562
 angr/block.py,sha256=FnsFukbXhLzYPW5zJRXMxNmvCRU4LFlFIaJwo5sAqkY,14468
 angr/callable.py,sha256=-E9HelavtRY1xPAxCVXl120H8Rb7Myd2IcrXtWZFAOU,6034
-angr/calling_conventions.py,sha256=Ri-xAayzVrtoWvKXO01nsV8VM14iOxIWfouwBQIYe8s,90745
+angr/calling_conventions.py,sha256=DlzXH3rrjyyiOYxBThKRNM4-I7HImOqYyh9H39DBLAA,90942
 angr/code_location.py,sha256=ow0Z8OF8FNBPZs4PUmRej_5aHaKTmUIanYPro3iHAMs,5476
 angr/codenode.py,sha256=J_lZNz8akZzBI4ok0KpI1eNGvZbCt_quOAeUplaEB6I,3784
 angr/errors.py,sha256=QdVWy5wElJYd4srA2k2vFzHPiE69gkXfksB9B6y6W8Y,8245
@@ -244,7 +244,7 @@ angr/analyses/identifier/functions/strtol.py,sha256=Py_6Y9rR5dfy53LX8w9WktSBaxdy
 angr/analyses/propagator/__init__.py,sha256=5-UKSiAtYocLzmQWXPzxyBnPui_c8P_r617KDwtRnNw,43
 angr/analyses/propagator/engine_ail.py,sha256=ktZlhXS7_WPOecalGliRv5p8TeW1r6Ie18iiLtsl3wY,62565
 angr/analyses/propagator/engine_base.py,sha256=0j5NzJ9jArF4KeysBeiPoo_RKyCvlgn-i3inSZt1cyc,1735
-angr/analyses/propagator/engine_vex.py,sha256=I32McxCOk5C30ts-E3i-BDaxlnI27HzchmRWMKsu-oY,12199
+angr/analyses/propagator/engine_vex.py,sha256=BthcZPPizwrCfPe4P6ycZ8bNAT8YN0h5gAmR-8UqpLE,12491
 angr/analyses/propagator/outdated_definition_walker.py,sha256=OJnI9rlyutyy2qHMTqnrnQJCXKcBHvgwHfiqlWDECiY,6890
 angr/analyses/propagator/propagator.py,sha256=aoTheBycoH8Fa07Uy6bZYQqtjbiGe90_c6QiwVIolfI,16071
 angr/analyses/propagator/tmpvar_finder.py,sha256=GqP1lm-_ez4AvXraDt1BQ1o7GvdjLI7j-TUL5k-lKbU,442
@@ -260,7 +260,7 @@ angr/analyses/reaching_definitions/external_codeloc.py,sha256=47DEQpj8HBSa-_TImW
 angr/analyses/reaching_definitions/function_handler.py,sha256=TB6yW0TBQnTdAv3SOBcui6dSCBMoviivKx0v8COY12w,26839
 angr/analyses/reaching_definitions/heap_allocator.py,sha256=L7LCcE-QvLd_vuc0slWmQ6X73wkYNMkUEDy1cJAV818,2634
 angr/analyses/reaching_definitions/rd_initializer.py,sha256=w_lERfOKBrTQzsLG8ObQyeyYRlnDwUhlZVZ99SuQWb8,10323
-angr/analyses/reaching_definitions/rd_state.py,sha256=iOYzJFpWRKSaO_FmEThJyFXzLn3y9dTvlZB7Feepm2I,23434
+angr/analyses/reaching_definitions/rd_state.py,sha256=4HF1oi2R20EAV7uwa3iqIhurvuEye_VTgF8uzwjGtI4,23437
 angr/analyses/reaching_definitions/reaching_definitions.py,sha256=CjW3Q7rj_fX-LQ09eACCPohXX44FT13ewWpvJQk-vr4,23163
 angr/analyses/reaching_definitions/subject.py,sha256=GVaI1jM-Nv2MWaCjJ-Q_54nSS3hvAaZthz14AJJNq-A,1995
 angr/analyses/typehoon/__init__.py,sha256=kCQMAuvsUKAdYFiOstBzMBCqpquJKJCQSe0CGAr2Rng,31
@@ -473,7 +473,7 @@ angr/knowledge_plugins/xrefs/__init__.py,sha256=-5A2h048WTRu6Et7q7bqlc-AyBXNuJ9A
 angr/knowledge_plugins/xrefs/xref.py,sha256=w4wjDFl4xtJYOtJplp9s1AIX3wI1RE71po3ufh1M4aY,4963
 angr/knowledge_plugins/xrefs/xref_manager.py,sha256=GYF9N1t4JxkDNGAwrVLo4_NF51P4gqiuQ21F0IbloF0,4026
 angr/knowledge_plugins/xrefs/xref_types.py,sha256=VR3xLQQ-gUg25oX0OL3BJHyQRlZh2A8syBac9ZMS9n4,271
-angr/lib/angr_native.dll,sha256=11cK_YtAgS6M65LdUcp19DHZtE6qxMmhDBZCZe0o_II,19209728
+angr/lib/angr_native.dll,sha256=KQEP6GGhkBBfIIyC2CQ_zCGSoTzT8OTGhWPjcllf6Dg,19209728
 angr/misc/__init__.py,sha256=Ct-Q6-c-Frdz5Ihkqmou3j_1jyJi8WJXlQxs-gPQg0Y,237
 angr/misc/ansi.py,sha256=TKrx7d_MViChHh5RBR2VLufNrujTUioJWsZS5ugk8k4,807
 angr/misc/autoimport.py,sha256=6WT-Z6wf5NiacQhKZmR4d2bPOvNrokA7Wg0g2MUXSuw,2371
@@ -1219,7 +1219,7 @@ tests/analyses/test_cfb.py,sha256=5lV3QHvDqQlyHvtVXkxiMdL091uUM13wnzGl8n1Hakk,91
 tests/analyses/test_class_identifier.py,sha256=UaswarpeuBDiyaEkjWng_AwxU-kg_x-ZHR0u24mNqhU,1428
 tests/analyses/test_clinic.py,sha256=I1Su7BtiTPWdSf3l90vy-lHAA75_lbzdj-g_syIJlLM,743
 tests/analyses/test_codetagging.py,sha256=JMTdmJuaW_rZNcg4twVWKEjs8SQKdd8J8jttBPLorQ0,1026
-tests/analyses/test_constantpropagation.py,sha256=hPzlPDgri6ngqko8LIcaebToETugwS_I17MHcaxEjHI,2995
+tests/analyses/test_constantpropagation.py,sha256=voSC6P3Z2N2PLFrW73d9_fut4P-ODFADtSdjfoR_Ym8,3028
 tests/analyses/test_ddg.py,sha256=PcCbM3VQciTO02-XkjkCJeu5wahsXyNvKyyKHja36ao,3176
 tests/analyses/test_ddg_global_var_dependencies.py,sha256=Dv9ObVLuCuf8pkhUK2fL0jC--NcnVjgRj1MyG2Xggxk,3613
 tests/analyses/test_ddg_memvar_addresses.py,sha256=anbiZ8s1hgu6XhDxS_zVfb43DtHQLrmNWRhLdMk1zCw,1258
@@ -1415,9 +1415,9 @@ tests/storage/test_multivalues.py,sha256=x82duiIMsU9nE-6vhm-eEsofshKfbVy5d9CNgdC
 tests/storage/test_permissions.py,sha256=-Gsd1CUO7xZv7NTieiuikm33xfl33MyzIkembL3CuIw,883
 tests/storage/test_ptmalloc.py,sha256=WwORhRoN0SYC8R9aJ_RITbVKlB6JQnLyINTWbT4PidU,10592
 tests/storage/test_relro_perm.py,sha256=gqNbkYfAYr0wM-oSijS3HYi0-cbtplMDCSWQqRCqEb4,1406
-angr-9.2.80.dist-info/LICENSE,sha256=cgL_ho5B1NH8UxwtBuqThRWdjear8b7hktycaS1sz6g,1327
-angr-9.2.80.dist-info/METADATA,sha256=pjz4GHUET6bNa5338NcibLjyF6WbTCYzuU8adYiIKtE,4856
-angr-9.2.80.dist-info/WHEEL,sha256=6iYPr8vTHsyDK75jr9X0V3I9wPSVmtwr_8fdATBciGk,98
-angr-9.2.80.dist-info/entry_points.txt,sha256=Vjh1C8PMyr5dZFMnik5WkEP01Uwr2T73I3a6N32sgQU,44
-angr-9.2.80.dist-info/top_level.txt,sha256=EGgw8HjaUI9JWd6w70Tzkn1AcyKTMJTVJ9OpWyaOewk,11
-angr-9.2.80.dist-info/RECORD,,
+angr-9.2.81.dist-info/LICENSE,sha256=cgL_ho5B1NH8UxwtBuqThRWdjear8b7hktycaS1sz6g,1327
+angr-9.2.81.dist-info/METADATA,sha256=vbFFPeIgV_sbPu3RP3UYBa5BcZljPH68TXwjaDdGREY,4856
+angr-9.2.81.dist-info/WHEEL,sha256=6iYPr8vTHsyDK75jr9X0V3I9wPSVmtwr_8fdATBciGk,98
+angr-9.2.81.dist-info/entry_points.txt,sha256=Vjh1C8PMyr5dZFMnik5WkEP01Uwr2T73I3a6N32sgQU,44
+angr-9.2.81.dist-info/top_level.txt,sha256=EGgw8HjaUI9JWd6w70Tzkn1AcyKTMJTVJ9OpWyaOewk,11
+angr-9.2.81.dist-info/RECORD,,

tests/analyses/test_constantpropagation.py

@@ -51,9 +51,10 @@ class TestConstantpropagation(unittest.TestCase):
 
     def test_register_propagation_across_calls(self):
         call_targets = [
-            "_0",  # Resolved
-            "rdi",  # TOP
-            "qword ptr [0xBAD]",  # Unresolved
+            "syscall",
+            "call _0",  # Resolved
+            "call rdi",  # TOP
+            "call qword ptr [0xBAD]",  # Unresolved
         ]
 
         for target in call_targets:
@@ -63,7 +64,7 @@ class TestConstantpropagation(unittest.TestCase):
                 mov rcx, 0x12345678
                 mov rbp, 0xFEDCBA90
             _11:
-                call {target}
+                {target}
                 mov rax, rcx
                 mov rdi, rbp
                 ret