[error] Separate unsupported instruction logging #7

vusec · Dec 22, 2023 · b8bcbe4 · b8bcbe4
1 parent 52ceb6b
commit b8bcbe4
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/analyzer/scanner/scanner.py b/analyzer/scanner/scanner.py
@@ -617,10 +617,23 @@ def run(self, proj: angr.Project, start_address, config) -> list[TransmissionExp
             except SplitException as e:
                 l.error(str(e))
                 continue
+            except (angr.errors.SimIRSBNoDecodeError, angr.errors.UnsupportedIROpError) as e:
+                l.error("=============== UNSUPPORTED INSTRUCTION ===============")
+                l.error(str(e))
+                report_unsupported(e, hex(self.cur_state.addr), hex(start_address), error_type="SCANNER")
+                continue
+            except angr.errors.UnsupportedDirtyError as e:
+                if "IRET" in str(e):
+                    continue
+                l.error("=============== UNSUPPORTED INSTRUCTION ===============")
+                l.error(str(e))
+                report_unsupported(e, hex(self.cur_state.addr), hex(start_address), error_type="SCANNER")
+                continue
             except Exception as e:
                 l.error("=============== ERROR ===============")
                 l.error(str(e))
-                l.error(traceback.format_exc())
+                if not l.disabled:
+                    traceback.format_exc()
                 report_error(e, hex(self.cur_state.addr), hex(start_address), error_type="SCANNER")
                 continue
 

diff --git a/analyzer/shared/utils.py b/analyzer/shared/utils.py
@@ -48,14 +48,28 @@ def get_x86_registers():
 
 
 def report_error(error: Exception, where="dunno", start_addr="dunno", error_type="GENERIC"):
+    ins_addr = None
+    if hasattr(error, 'ins_addr') and isinstance(error.ins_addr, int):
+        ins_addr = hex(error.ins_addr)
+
     o = open("fail.txt", "a+")
     o.write(f"---------------- [ {error_type} ERROR ] ----------------\n")
-    o.write(f"in basic block: {where}     started at:{start_addr}\n")
+    o.write(f"where: {where}     started at: {start_addr} {f'instruction addr: {ins_addr}' if ins_addr else ''}\n")
     o.write(str(error) + "\n")
     o.write(traceback.format_exc())
     o.write("\n")
     o.close()
 
+def report_unsupported(error: Exception, where="dunno", start_addr="dunno", error_type="GENERIC"):
+    if hasattr(error, 'ins_addr') and isinstance(error.ins_addr, int):
+        where = hex(error.ins_addr)
+
+    o = open("unsupported.txt", "a+")
+    o.write(f"---------------- [ {error_type} UNSUPPORTED INSTRUCTION ] ----------------\n")
+    o.write(f"instruction addr: {where}     started at: {start_addr}\n")
+    o.write(str(error) + "\n")
+    o.write("\n")
+    o.close()
 
 def branch_outcomes(history):
     outcomes = []

diff --git a/tests/test-cases/.gitignore b/tests/test-cases/.gitignore
@@ -1,3 +1,4 @@
 */gadget
 output/*
 fail.txt
+unsupported.txt