compute taint errors in single pass over the set of atoms

Reviewed By: jeremydubreil

Differential Revision: D2695992

fb-gh-sync-id: 21f0ec5

infer/src/backend/tabulation.ml

@@ -850,84 +850,58 @@ let inconsistent_actualpre_missing actual_pre split_opt =
       Prover.check_inconsistency prop''
   | None -> false
 
-(* Collect the taint/untain info on the pi part *)
+(* perform the taint analysis check by comparing the taint atoms in [calling_pi] with the untaint
-(* TODO (t9199155): this be done with a single traversal of the list of atoms/combined with
+   atoms required by the [missing_pi] computed during abduction *)
-   intersection_taint_untaint to be much more efficient *)
+let do_taint_check caller_pname callee_pname calling_pi missing_pi sub prop =
-let rec get_taint_untaint pi =
+  (* get a version of [missing_pi] whose var names match the names in calling pi *)
-  let get_att_exp p e (t,u) atom =
+  let missing_pi_sub = Prop.pi_sub sub missing_pi in
-    match Prop.get_taint_attribute p e with
+  let combined_pi = calling_pi @ missing_pi_sub in
-    | Some(Sil.Ataint _) ->
+  (* build a map from exp -> [taint attrs, untaint attrs], keeping only exprs with both kinds of
-        L.d_str "   ---->Found TAINTED exp: "; Sil.d_exp e; L.d_ln ();
+     attrs (we will flag errors on those exprs) *)
-        ((e, atom)::t, u)
+  let collect_taint_untaint_exprs acc_map atom = match Prop.atom_get_exp_attribute atom with
-    | Some(Sil.Auntaint) ->
+    | Some (e, Sil.Ataint _) ->
-        L.d_str "   ---->Found UNTAINTED exp: "; Sil.d_exp e; L.d_ln ();
+        let taint_atoms, untaint_atoms = try Sil.ExpMap.find e acc_map with Not_found -> ([], []) in
-        (t, (e, atom)::u)
+        Sil.ExpMap.add e (atom :: taint_atoms, untaint_atoms) acc_map
-    | _ -> (t,u) in
+    | Some (e, Sil.Auntaint) ->
-  match pi with
+        let taint_atoms, untaint_atoms = try Sil.ExpMap.find e acc_map with Not_found -> ([], []) in
-  | [] -> ([],[])
+        Sil.ExpMap.add e (taint_atoms, atom :: untaint_atoms) acc_map
-  | (Sil.Aneq (e1, e2) as atom) :: pi' ->
+    | _ -> acc_map in
-      let (t, u) = get_taint_untaint pi' in
+  let taint_untaint_exp_map =
-      let p = Prop.replace_pi [atom] Prop.prop_emp in
+    IList.fold_left
-      let (t',u') = get_att_exp p e1 (t,u) atom in
+      collect_taint_untaint_exprs
-      get_att_exp p e2 (t',u') atom
+      Sil.ExpMap.empty
-  | _ :: pi' -> get_taint_untaint pi'
+      combined_pi
-
+    |> Sil.ExpMap.filter (fun _ (taint, untaint) -> taint <> []  && untaint <> []) in
-(* perform the taint analysis check by comparing in a function call the
+  (* TODO: in the future, we will have a richer taint domain that will require making sure that the
-   actual calling state and the missing pi computed by abduction *)
+     "kind" (e.g. security, privacy) of the taint and untaint match, but for now we don't look at
-let do_taint_check caller_pname callee_pname calling_prop missing_pi sub prop =
+     the untaint atoms *)
-  let rec intersection_taint_untaint taint untaint acc =
+  let report_taint_errors e (taint_atoms, _untaint_atoms) =
-    match taint with
+    let report_one_error taint_atom =
-    | [] -> acc
+      let tainting_fun = match Prop.atom_get_exp_attribute taint_atom with
-    | (e1, atom_taint) :: taint' ->
+        | Some (_, Sil.Ataint pname) -> pname
-        let acc' =
+        | _ -> failwith "Expected to get taint attr on atom" in
-          try
+      let err_desc = Errdesc.explain_tainted_value_reaching_sensitive_function e tainting_fun
-            let (e2, atom_untaint) =
-              IList.find (fun (e2, _) -> Sil.exp_equal e1 e2) untaint in
-            (e1, atom_taint, atom_untaint) :: acc
-          with Not_found -> acc in
-        intersection_taint_untaint taint' untaint acc' in
-  let combined_calling_prop =
-    Prop.replace_pi ((Prop.get_pi calling_prop) @ missing_pi) calling_prop in
-  let sub_combined_calling_prop = Prop.prop_sub sub combined_calling_prop in
-  let taint_set, untaint_set = get_taint_untaint (Prop.get_pi sub_combined_calling_prop) in
-  L.d_str "Actual pre combined with missing pi: "; Prop.d_prop sub_combined_calling_prop; L.d_ln();
-  L.d_str "Taint set: "; Sil.d_exp_list (fst (IList.split taint_set)); L.d_ln ();
-  L.d_str "Untaint set: "; Sil.d_exp_list (fst (IList.split untaint_set)); L.d_ln ();
-  let report_taint_error (e, _, _) =
-    L.d_str "Taint error detected!"; L.d_ln();
-    let e' = match Errdesc.find_pvar_with_exp prop e with
-      | Some (pv, _) -> Sil.Lvar pv
-      | None -> e in
-    let tainting_fun = match Prop.get_taint_attribute prop e with
-      | Some (Sil.Ataint tf) -> tf
-      | _ -> Procname.empty  (* by definition of e, we should not get to this case *) in
-    let err_desc = Errdesc.explain_tainted_value_reaching_sensitive_function e' tainting_fun
           callee_pname (State.get_loc ()) in
       let exn =
         Exceptions.Tainted_value_reaching_sensitive_function
           (err_desc, try assert false with Assert_failure x -> x) in
       Reporting.log_warning caller_pname exn in
-  match intersection_taint_untaint taint_set untaint_set [] with
+    IList.iter report_one_error taint_atoms in
-  | [] ->
+  Sil.ExpMap.iter report_taint_errors taint_untaint_exp_map;
-      L.d_str "NO taint error detected"; L.d_ln();
-      missing_pi
-  | taint_errors ->
-      IList.iter report_taint_error taint_errors;
-      (* get a version of [missing_pi] whose var names match names in taint_errors *)
-      let missing_pi_sub =
-        Prop.get_pi (Prop.prop_sub sub (Prop.replace_pi missing_pi Prop.prop_emp)) in
   (* filter out UNTAINT(e) atoms from [missing_pi] such that we have already reported a taint
      error on e. without doing this, we will get PRECONDITION_NOT_MET (and failed spec
      inference), which is bad. instead, what this does is effectively assume that the UNTAINT(e)
-         precondition was met, and contine with the analysis under this assumption. this makes sense
+     precondition was met, and continue with the analysis under this assumption. this makes sense
      because we are reporting the taint error, but propagating a *safe* postcondition w.r.t to
      tainting. *)
-      IList.filter
+  let not_untaint_atom atom = not
-        (fun atom -> not
+      (Sil.ExpMap.exists
-            (IList.exists
+         (fun _ (_, untaint_atoms) ->
-               (fun (_, _, atom_untaint) -> Sil.atom_equal atom atom_untaint)
+            IList.exists
-               taint_errors))
+              (fun a -> Sil.atom_equal atom a)
-        missing_pi_sub
+              untaint_atoms)
+         taint_untaint_exp_map) in
+  IList.filter not_untaint_atom missing_pi_sub
 
 let class_cast_exn pname_opt texp1 texp2 exp ml_location =
   let desc = Errdesc.explain_class_cast_exception pname_opt texp1 texp2 exp (State.get_node ()) (State.get_loc ()) in
@@ -974,7 +948,7 @@ let exe_spec
       let do_split () =
         let missing_pi' =
           if !Config.taint_analysis then
-            do_taint_check caller_pname callee_pname actual_pre missing_pi sub2 prop
+            do_taint_check caller_pname callee_pname (Prop.get_pi actual_pre) missing_pi sub2 prop
           else missing_pi in
         process_splitting actual_pre sub1 sub2 frame missing_pi' missing_sigma frame_fld missing_fld frame_typ missing_typ in
       let report_valid_res split =