@@ -397,12 +397,12 @@ let trusted_os_cmd_fmt_arg_string_constant_string_stmt
397397 postcondition on the call that produced [x] as its return value. *)
398398let trusted_os_cmd_fmt_arg_string_return_value_postcondition
399399 (finfo : function_info_int )
400- (_loc : location_int )
400+ (loc : location_int )
401401 (x : xpr_t )
402402 (_quotes : quote_status_t )
403403 (_optlen : int option ): po_status_t =
404404 match x with
405- | XVar v when finfo#env#is_return_value v || finfo#env#is_sideeffect_value v ->
405+ | XVar v when finfo#env#is_return_value v ->
406406 TR. tfold
407407 ~ok: (fun callsite ->
408408 let ctinfo = finfo#get_call_target callsite in
@@ -421,9 +421,104 @@ let trusted_os_cmd_fmt_arg_string_return_value_postcondition
421421 Violated (" return value of " ^ ctinfo#get_name ^ " is potentially tainted" )
422422 else
423423 Open )
424- ~error: (fun _ -> Open )
424+ ~error: (fun e ->
425+ begin
426+ log_error_result
427+ ~tag: " trusted_os_cmd_fmt_arg_string_return_value_postcondition"
428+ ~msg: (p2s loc#toPretty)
429+ __FILE__ __LINE__
430+ [" x: " ^ (x2s x); String. concat " ; " e];
431+ Open
432+ end )
425433 (finfo#env#get_call_site v)
426- | _ -> Open
434+ | _ ->
435+ Open
436+
437+
438+ let trusted_os_cmd_fmt_arg_string_parameter_postcondition
439+ (finfo : function_info_int )
440+ (loc : location_int )
441+ (x : xpr_t )
442+ (quotes : quote_status_t )
443+ (_optlen : int option ): po_status_t =
444+ let floc = BCHFloc. get_finfo_floc finfo loc in
445+ let tag = " trusted_os_cmd_fmt_arg_string_parameter_postcondition" in
446+ if not floc#has_call_target then
447+ begin
448+ log_diagnostics_result
449+ ~tag
450+ ~msg: (p2s loc#toPretty)
451+ __FILE__ __LINE__
452+ [" x: " ^ (x2s x); " not a call site" ];
453+ Open
454+ end
455+ else
456+ let ctinfo = floc#get_call_target in
457+ match floc#get_bterm_evaluator with
458+ | None ->
459+ begin
460+ log_diagnostics_result
461+ ~tag
462+ ~msg: (p2s loc#toPretty)
463+ __FILE__ __LINE__
464+ [" x: " ^ (x2s x); " no bterm evaluator found" ];
465+ Open
466+ end
467+ | Some btermev ->
468+ let check_bterm (bterm : bterm_t ): bool =
469+ match btermev#bterm_xpr bterm with
470+ | Some xpost ->
471+ let xpost' = floc#inv#rewrite_expr xpost in
472+ (match simplify_xpr (XOp (XMinus , [xpost'; x])) with
473+ | XConst (IntConst n ) -> n#equal CHNumerical. numerical_zero
474+ | _ -> false )
475+ | _ -> false in
476+ List. fold_left (fun status post ->
477+ match status with
478+ | Open ->
479+ (match post with
480+ | XXTrustedOsCmdString bterm
481+ | XXTrustedString bterm ->
482+ if check_bterm bterm then
483+ Discharged (
484+ " trusted-os-cmd-string postcondition from "
485+ ^ ctinfo#get_name)
486+ else
487+ begin
488+ log_diagnostics_result
489+ ~tag
490+ ~msg: (p2s loc#toPretty)
491+ __FILE__ __LINE__
492+ [" x: " ^ (x2s x); " xpr does not match term" ];
493+ Open
494+ end
495+ | XXTrustedOsCmdFmtArgString (bterm , q , _ ) when q = quotes ->
496+ if check_bterm bterm then
497+ Discharged (
498+ " trusted-os-cmd-fmt-arg-string postcondition from "
499+ ^ ctinfo#get_name)
500+ else
501+ begin
502+ log_diagnostics_result
503+ ~tag
504+ ~msg: (p2s loc#toPretty)
505+ __FILE__ __LINE__
506+ [" x: " ^ (x2s x); " xpr do not match" ];
507+ Open
508+ end
509+ | p ->
510+ begin
511+ log_diagnostics_result
512+ ~tag
513+ ~msg: (p2s loc#toPretty)
514+ __FILE__ __LINE__
515+ [" x: " ^ (x2s x);
516+ " pred: " ^ (p2s (xxpredicate_to_pretty p))];
517+ Open
518+ end )
519+
520+ | _ ->
521+ status) Open ctinfo#get_postconditions
427522
428523
429524let trusted_os_cmd_fmt_arg_string_delegate_local
@@ -468,6 +563,12 @@ let discharge_trusted_os_cmd_fmt_arg_string
468563 trusted_os_cmd_fmt_arg_string_return_value_postcondition
469564 finfo loc x quotes optlen
470565 | _ -> status in
566+ let status =
567+ match status with
568+ | Open ->
569+ trusted_os_cmd_fmt_arg_string_parameter_postcondition
570+ finfo loc x quotes optlen
571+ | _ -> status in
471572 let status =
472573 match status with
473574 | Open ->
@@ -500,11 +601,22 @@ let output_format_string_delegate
500601 ~ok: (fun reg ->
501602 let _ =
502603 finfo#add_register_parameter_location reg BCHBCTypeUtil. t_charptr 4 in
503- let ftspar = finfo#get_summary#get_parameter_for_register reg in
504- let dst = ArgValue ftspar in
505- let xpred = XXOutputFormatString dst in
506- let _ = finfo#add_precondition xpred in
507- Delegated xpred)
604+ TR. tfold
605+ ~ok: (fun ftspar ->
606+ let dst = ArgValue ftspar in
607+ let xpred = XXOutputFormatString dst in
608+ let _ = finfo#add_precondition xpred in
609+ Delegated xpred)
610+ ~error: (fun e ->
611+ begin
612+ log_error_result
613+ ~tag: " discharge_output_format_string"
614+ ~msg: (p2s loc#toPretty)
615+ __FILE__ __LINE__
616+ [" v: " ^ (p2s v#toPretty); String. concat " , " e];
617+ Open
618+ end )
619+ (finfo#get_summary#get_parameter_for_register reg))
508620 ~error: (fun e ->
509621 begin
510622 log_error_result
@@ -589,11 +701,22 @@ let restricted_output_format_string_delegate
589701 ~ok: (fun reg ->
590702 let _ =
591703 finfo#add_register_parameter_location reg BCHBCTypeUtil. t_charptr 4 in
592- let ftspar = finfo#get_summary#get_parameter_for_register reg in
593- let dst = ArgValue ftspar in
594- let xpred = XXRestrictedOutputFormatString (dst, sl) in
595- let _ = finfo#add_precondition xpred in
596- Delegated xpred)
704+ TR. tfold
705+ ~ok: (fun ftspar ->
706+ let dst = ArgValue ftspar in
707+ let xpred = XXRestrictedOutputFormatString (dst, sl) in
708+ let _ = finfo#add_precondition xpred in
709+ Delegated xpred)
710+ ~error: (fun e ->
711+ begin
712+ log_error_result
713+ ~tag: " discharge_restricted_output_format_string"
714+ ~msg: (p2s loc#toPretty)
715+ __FILE__ __LINE__
716+ [" v: " ^ (p2s v#toPretty); String. concat " , " e];
717+ Open
718+ end )
719+ (finfo#get_summary#get_parameter_for_register reg))
597720 ~error: (fun e ->
598721 begin
599722 log_error_result
0 commit comments