Print this page
11972 resync smatch

Split Close
Expand all
Collapse all
          --- old/usr/src/tools/smatch/src/check_get_user_overflow.c
          +++ new/usr/src/tools/smatch/src/check_get_user_overflow.c
↓ open down ↓ 100 lines elided ↑ open up ↑
 101  101  static void match_assign(struct expression *expr)
 102  102  {
 103  103          char *name;
 104  104  
 105  105          name = get_macro_name(expr->pos);
 106  106          if (!name || strcmp(name, "get_user") != 0) {
 107  107                  match_normal_assign(expr);
 108  108                  return;
 109  109          }
 110  110          name = expr_to_var(expr->right);
 111      -        if (!name || strcmp(name, "__val_gu") != 0)
      111 +        if (!name || (strcmp(name, "__val_gu") != 0 && strcmp(name, "__gu_val")))
 112  112                  goto free;
 113  113          set_state_expr(my_max_id, expr->left, &user_data);
 114  114          set_state_expr(my_min_id, expr->left, &user_data);
 115  115  free:
 116  116          free_string(name);
 117  117  }
 118  118  
 119  119  static void check_expr(struct expression *expr)
 120  120  {
 121  121          struct sm_state *sm;
 122  122          sval_t max;
 123  123          sval_t sval;
 124  124          char *name;
 125  125          int overflow = 0;
 126  126          int underflow = 0;
 127  127  
 128  128          sm = get_sm_state_expr(my_max_id, expr);
 129  129          if (sm && slist_has_state(sm->possible, &user_data)) {
 130      -                if (!get_absolute_max(expr, &max) || sval_cmp_val(max, 20000) > 0)
      130 +                get_absolute_max(expr, &max);
      131 +                if (sval_cmp_val(max, 20000) > 0)
 131  132                          overflow = 1;
 132  133          }
 133  134  
 134  135          sm = get_sm_state_expr(my_min_id, expr);
 135  136          if (sm && slist_has_state(sm->possible, &user_data)) {
 136      -                if (!get_absolute_min(expr, &sval) ||
 137      -                    (sval_is_negative(sval) && sval_cmp_val(sval, -20000) < 0))
      137 +                get_absolute_min(expr, &sval);
      138 +                if (sval_is_negative(sval) && sval_cmp_val(sval, -20000) < 0)
 138  139                          underflow = 1;
 139  140          }
 140  141  
 141  142          if (!overflow && !underflow)
 142  143                  return;
 143  144  
 144  145          name = expr_to_var_sym(expr, NULL);
 145  146          if (overflow && underflow)
 146  147                  sm_warning("check for integer over/underflow '%s'", name);
 147  148          else if (underflow)
↓ open down ↓ 40 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX