REP: add json output to chkx report patchcandidates

Author: waskyo

chb/buffer/LibraryCallCallsites.py

@@ -227,6 +227,49 @@ def lentype(self) -> str:
             else:
                 return lenterm
 
+    @property
+    def dstoffset(self) -> Optional[int]:
+        """Returns the stack offset for our destination buffer"""
+        if self.dstarg is None:
+            return None
+        return self.dstarg.stack_address_offset()
+
+    def to_json_result(self) -> JSONResult:
+        if self.dstarg is None:
+            chklogger.logger.warning(
+                "No expression found for destination argument: %s", self)
+            return JSONResult("librarycallsideeffect", {}, "fail",
+                              "No expression found for destination argument")
+        dstoffset = self.dstoffset
+        if dstoffset is None:
+            chklogger.logger.warning(
+                "No value found for destination stack offset : %s", self)
+            return JSONResult("librarycallsideeffect", {}, "fail",
+                              "No value found for destination stack offset")
+
+        fn = self.instr.function
+        stackframe = fn.stackframe
+        stackbuffer = stackframe.get_stack_buffer(dstoffset)
+        if stackbuffer is None:
+            chklogger.logger.warning(
+                "No stackbuffer found for %s at offset %s", self.instr, dstoffset)
+            return JSONResult("librarycallsideeffect", {}, "fail",
+                              "No stackbuffer found for %s at offset %s" %
+                              (self.instr, dstoffset))
+
+        buffersize = stackbuffer.size
+
+        content: Dict[str, Any] = {}
+        content["annotation"] = self.instr.annotation
+        content["faddr"] = self.faddr
+        content["iaddr"] = self.instr.iaddr
+        content["buffersize"] = buffersize
+        content["target-function"] = self.summary.name
+        content["stack-offset"] = dstoffset
+        content["length-argument"] = str(self.lenarg)
+
+        return JSONResult("librarycallsideeffect", content, "ok")
+
     def __str__(self) -> str:
         return self.instr.iaddr + ": " + str(self.instr.annotation)
 

chb/cmdline/reportcmds.py

@@ -989,6 +989,30 @@ def perc(v: float) -> str:
     exit(0)
 
 
+def write_json_result(xfilename: Optional[str],
+                      jresult: JSONResult,
+                      schema_name: str,
+                     ) -> None:
+    if jresult.is_ok:
+        okresult = JU.jsonok(schema_name, jresult.content)
+        if xfilename is not None:
+            filename = xfilename + ".json"
+            with open(filename, "w") as fp:
+                json.dump(okresult, fp, indent=2)
+            chklogger.logger.info("JSON output written to " + filename)
+        else:
+            print(json.dumps(okresult))
+    else:
+        failresult = JU.jsonfail(jresult.reason)
+        if xfilename is not None:
+            filename = xfilename + ".json"
+            with open(filename, "w") as fp:
+                json.dump(failresult, fp, indent=2)
+            chklogger.logger.warning(
+                "JSON failure output written to " + filename)
+        else:
+            print(json.dumps(failresult))
+
 def report_buffer_bounds(args: argparse.Namespace) -> NoReturn:
 
     # arguments
@@ -1022,49 +1046,27 @@ def report_buffer_bounds(args: argparse.Namespace) -> NoReturn:
                 if calltgt.is_so_target:
                     libcalls.add_library_callsite(faddr, instr)
 
-    def write_json_result(
-            xfilename: Optional[str], jresult: JSONResult) -> None:
-        if jresult.is_ok:
-            okresult = JU.jsonok("bufferboundsassessment", jresult.content)
-            if xfilename is not None:
-                filename = xfilename + ".json"
-                with open(filename, "w") as fp:
-                    json.dump(okresult, fp, indent=2)
-                chklogger.logger.info("JSON output written to " + filename)
-            else:
-                print(json.dumps(okresult))
-        else:
-            failresult = JU.jsonfail(jresult.reason)
-            if xfilename is not None:
-                filename = xfilename + ".json"
-                with open(filename, "w") as fp:
-                    json.dump(failresult, fp, indent=2)
-                chklogger.logger.warning(
-                    "JSON failure output written to " + filename)
-            else:
-                print(json.dumps(failresult))
-
     if xjson:
         content: Dict[str, Any] = {}
         xinfodata = xinfo.to_json_result()
         if xinfodata.is_ok:
             content["identification"] = xinfodata.content
         else:
-            write_json_result(xoutput, xinfodata)
+            write_json_result(xoutput, xinfodata, "bufferboundsassessment")
         analysisstats = app.result_metrics.to_json_result()
         if analysisstats.is_ok:
             content["analysis"] = analysisstats.content
         else:
-            write_json_result(xoutput, analysisstats)
+            write_json_result(xoutput, analysisstats, "bufferboundsassessment")
 
         libcallsresult = libcalls.to_json_result()
         if libcallsresult.is_ok:
             content["bounds"] = libcallsresult.content
         else:
-            write_json_result(xoutput, libcallsresult)
+            write_json_result(xoutput, libcallsresult,"bufferboundsassessment" )
 
         write_json_result(xoutput, JSONResult(
-            "libcboundsanalysis", content, "ok"))
+            "libcboundsanalysis", content, "ok"), "bufferboundsassessment")
 
     if not xverbose:
         exit(0)
@@ -1174,38 +1176,47 @@ def include_target(target: 'CallTarget') -> bool:
                 if calltgt.is_so_target and include_target(calltgt):
                     libcalls.add_library_callsite(faddr, instr)
 
-    print("Number of calls: " + str(n_calls))
+    chklogger.logger.debug("Number of calls: %s", n_calls)
 
     patchcallsites = libcalls.patch_callsites()
 
+    content: Dict[str, Any] = {}
+    if xjson:
+        xinfodata = xinfo.to_json_result()
+        if xinfodata.is_ok:
+            content["identification"] = xinfodata.content
+        else:
+            write_json_result(xoutput, xinfodata, "patchcandidates")
+
+    patch_records = []
+
     for pc in sorted(patchcallsites, key=lambda pc:pc.faddr):
-        instr = pc.instr
-        dstarg = pc.dstarg
-        if dstarg is None:
-            chklogger.logger.warning(
-                "No expression found for destination argument: %s",
-                str(instr))
-            continue
-        dstoffset = dstarg.stack_address_offset()
-        fn = instr.function
-        stackframe = fn.stackframe
-        stackbuffer = stackframe.get_stack_buffer(dstoffset)
-        if stackbuffer is None:
-            chklogger.logger.warning(
-                "No stackbuffer found for %s at offset %s",
-                str(instr), str(dstoffset))
+        jresult = pc.to_json_result()
+        if not jresult.is_ok:
+            chklogger.logger.warning("Couldn't process patch callsite %s", pc)
             continue
-        buffersize = stackbuffer.size
-
-        print("  " + pc.instr.iaddr + "  " + pc.instr.annotation)
-        print("  - faddr: " + pc.faddr)
-        print("  - iaddr: " + pc.instr.iaddr)
-        print("  - target function: " + str(pc.summary.name))
-        print("  - stack offset: " + str(dstoffset))
-        print("  - length argument: " + str(pc.lenarg))
-        print("  - buffersize: " + str(buffersize))
+
+        patch_records.append(jresult.content)
+
+    content["patch-records"] = patch_records
+    chklogger.logger.debug("Number of patch callsites: %s", len(content['patch-records']))
+
+    if xjson:
+        jcontent = JSONResult("patchcandidates", content, "ok")
+        write_json_result(xoutput, jcontent, "patchcandidates")
+        exit(0)
+
+    for patch_record in content["patch-records"]:
+        print("  " + patch_record['iaddr'] + "  " + patch_record['annotation'])
+        print("  - faddr: %s" % patch_record['faddr'])
+        print("  - iaddr: %s" % patch_record['iaddr'])
+        print("  - target function: %s" % patch_record['target-function'])
+        print("  - stack offset: %s" % patch_record['stack-offset'])
+        print("  - length argument: %s" % patch_record['length-argument'])
+        print("  - buffersize: %s" % patch_record['buffersize'])
         print("")
 
-    print("Number of patch callsites: " + str(len(patchcallsites)))
+    print("Generated %d patch records from %d library calls" %
+          (len(content['patch-records']), n_calls))
 
     exit(0)