diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2023-07-19 17:55:09 -0400 |
|---|---|---|
| committer | David Malcolm <dmalcolm@redhat.com> | 2023-07-19 17:55:09 -0400 |
| commit | b86c0fe327a5196a316bd698d12765b08de5dce7 (patch) | |
| tree | bf1cdaee5d3885e09226200022b460232dbf61b7 | |
| parent | b1ae46bdd19fc2aaea41bc894168bdaf4799be80 (diff) | |
| download | gcc-b86c0fe327a5196a316bd698d12765b08de5dce7.zip gcc-b86c0fe327a5196a316bd698d12765b08de5dce7.tar.gz gcc-b86c0fe327a5196a316bd698d12765b08de5dce7.tar.bz2 | |
analyzer: fix ICE on division of tainted floating-point values [PR110700]
gcc/analyzer/ChangeLog:
PR analyzer/110700
* region-model-manager.cc
(region_model_manager::get_or_create_int_cst): Assert that we have
an integral or pointer type.
* sm-taint.cc (taint_state_machine::check_for_tainted_divisor):
Don't check non-integral types.
gcc/testsuite/ChangeLog:
PR analyzer/110700
* gcc.dg/analyzer/taint-divisor-2.c: New test.
Signed-off-by: David Malcolm <dmalcolm@redhat.com>
| -rw-r--r-- | gcc/analyzer/region-model-manager.cc | 1 | ||||
| -rw-r--r-- | gcc/analyzer/sm-taint.cc | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/analyzer/taint-divisor-2.c | 13 |
3 files changed, 20 insertions, 0 deletions
diff --git a/gcc/analyzer/region-model-manager.cc b/gcc/analyzer/region-model-manager.cc index 4f11ef4..e43b99a 100644 --- a/gcc/analyzer/region-model-manager.cc +++ b/gcc/analyzer/region-model-manager.cc @@ -234,6 +234,7 @@ region_model_manager::get_or_create_int_cst (tree type, const poly_wide_int_ref &cst) { gcc_assert (type); + gcc_assert (INTEGRAL_TYPE_P (type) || POINTER_TYPE_P (type)); tree tree_cst = wide_int_to_tree (type, cst); return get_or_create_constant_svalue (tree_cst); } diff --git a/gcc/analyzer/sm-taint.cc b/gcc/analyzer/sm-taint.cc index 6d28d1f..09c1e93 100644 --- a/gcc/analyzer/sm-taint.cc +++ b/gcc/analyzer/sm-taint.cc @@ -1344,6 +1344,12 @@ taint_state_machine::check_for_tainted_divisor (sm_context *sm_ctxt, return; tree divisor_expr = gimple_assign_rhs2 (assign);; + + /* Until we track conditions on floating point values, we can't check to + see if they've been checked against zero. */ + if (!INTEGRAL_TYPE_P (TREE_TYPE (divisor_expr))) + return; + const svalue *divisor_sval = old_model->get_rvalue (divisor_expr, NULL); state_t state = sm_ctxt->get_state (assign, divisor_sval); diff --git a/gcc/testsuite/gcc.dg/analyzer/taint-divisor-2.c b/gcc/testsuite/gcc.dg/analyzer/taint-divisor-2.c new file mode 100644 index 0000000..de9a1cb --- /dev/null +++ b/gcc/testsuite/gcc.dg/analyzer/taint-divisor-2.c @@ -0,0 +1,13 @@ +// TODO: remove need for this option: +/* { dg-additional-options "-fanalyzer-checker=taint" } */ + +#include "analyzer-decls.h" + +__attribute__ ((tainted_args)) +double pr110700 (double x, double y) +{ + /* Ideally we'd complain here with -Wanalyzer-tainted-divisor, but + until we track conditions on floating point values, we can't check to + see if they've been checked against zero. */ + return x / y; +} |