Print this page
11506 smatch resync

Split Close
Expand all
Collapse all
          --- old/usr/src/tools/smatch/src/check_kernel.c
          +++ new/usr/src/tools/smatch/src/check_kernel.c
↓ open down ↓ 15 lines elided ↑ open up ↑
  16   16   */
  17   17  
  18   18  /*
  19   19   * This is kernel specific stuff for smatch_extra.
  20   20   */
  21   21  
  22   22  #include "scope.h"
  23   23  #include "smatch.h"
  24   24  #include "smatch_extra.h"
  25   25  
       26 +static sval_t err_ptr_min;
       27 +static sval_t err_ptr_max;
       28 +static sval_t null_ptr;
       29 +
  26   30  static int implied_err_cast_return(struct expression *call, void *unused, struct range_list **rl)
  27   31  {
  28   32          struct expression *arg;
  29   33  
  30   34          arg = get_argument_from_call_expr(call->args, 0);
  31      -        if (!get_implied_rl(arg, rl))
  32      -                *rl = alloc_rl(ll_to_sval(-4095), ll_to_sval(-1));
       35 +        if (!get_implied_rl(arg, rl)) {
       36 +                *rl = alloc_rl(err_ptr_min, err_ptr_max);
       37 +                *rl = cast_rl(get_type(arg), *rl);
       38 +        }
  33   39          return 1;
  34   40  }
  35   41  
  36   42  static void hack_ERR_PTR(struct symbol *sym)
  37   43  {
  38   44          struct symbol *arg;
  39   45          struct smatch_state *estate;
  40   46          struct range_list *after;
  41   47          sval_t low_error;
  42   48          sval_t minus_one;
↓ open down ↓ 28 lines elided ↑ open up ↑
  71   77          set_state(SMATCH_EXTRA, arg->ident->name, arg, alloc_estate_rl(after));
  72   78  }
  73   79  
  74   80  static void match_param_valid_ptr(const char *fn, struct expression *call_expr,
  75   81                          struct expression *assign_expr, void *_param)
  76   82  {
  77   83          int param = PTR_INT(_param);
  78   84          struct expression *arg;
  79   85          struct smatch_state *pre_state;
  80   86          struct smatch_state *end_state;
       87 +        struct range_list *rl;
  81   88  
  82   89          arg = get_argument_from_call_expr(call_expr->args, param);
  83   90          pre_state = get_state_expr(SMATCH_EXTRA, arg);
  84      -        end_state = estate_filter_range(pre_state, ll_to_sval(-4095), ll_to_sval(0));
       91 +        if (estate_rl(pre_state)) {
       92 +                rl = estate_rl(pre_state);
       93 +                rl = remove_range(rl, null_ptr, null_ptr);
       94 +                rl = remove_range(rl, err_ptr_min, err_ptr_max);
       95 +        } else {
       96 +                rl = alloc_rl(valid_ptr_min_sval, valid_ptr_max_sval);
       97 +        }
       98 +        end_state = alloc_estate_rl(rl);
  85   99          set_extra_expr_nomod(arg, end_state);
  86  100  }
  87  101  
  88  102  static void match_param_err_or_null(const char *fn, struct expression *call_expr,
  89  103                          struct expression *assign_expr, void *_param)
  90  104  {
  91  105          int param = PTR_INT(_param);
  92  106          struct expression *arg;
  93  107          struct range_list *rl;
  94  108          struct smatch_state *pre_state;
  95  109          struct smatch_state *end_state;
  96  110  
  97  111          arg = get_argument_from_call_expr(call_expr->args, param);
  98  112          pre_state = get_state_expr(SMATCH_EXTRA, arg);
  99      -        rl = alloc_rl(ll_to_sval(-4095), ll_to_sval(0));
      113 +        call_results_to_rl(call_expr, &ptr_ctype, "0,(-4095)-(-1)", &rl);
 100  114          rl = rl_intersection(estate_rl(pre_state), rl);
 101      -        rl = cast_rl(estate_type(pre_state), rl);
      115 +        rl = cast_rl(get_type(arg), rl);
 102  116          end_state = alloc_estate_rl(rl);
 103  117          set_extra_expr_nomod(arg, end_state);
 104  118  }
 105  119  
 106  120  static void match_not_err(const char *fn, struct expression *call_expr,
 107  121                          struct expression *assign_expr, void *unused)
 108  122  {
 109  123          struct expression *arg;
 110  124          struct smatch_state *pre_state;
 111      -        struct smatch_state *new_state;
      125 +        struct range_list *rl;
 112  126  
 113  127          arg = get_argument_from_call_expr(call_expr->args, 0);
 114  128          pre_state = get_state_expr(SMATCH_EXTRA, arg);
 115      -        new_state = estate_filter_range(pre_state, sval_type_min(&long_ctype), ll_to_sval(-1));
 116      -        set_extra_expr_nomod(arg, new_state);
      129 +        if (estate_rl(pre_state)) {
      130 +                rl = estate_rl(pre_state);
      131 +                rl = remove_range(rl, err_ptr_min, err_ptr_max);
      132 +        } else {
      133 +                rl = alloc_rl(valid_ptr_min_sval, valid_ptr_max_sval);
      134 +        }
      135 +        rl = cast_rl(get_type(arg), rl);
      136 +        set_extra_expr_nomod(arg, alloc_estate_rl(rl));
 117  137  }
 118  138  
 119  139  static void match_err(const char *fn, struct expression *call_expr,
 120  140                          struct expression *assign_expr, void *unused)
 121  141  {
 122  142          struct expression *arg;
 123  143          struct smatch_state *pre_state;
 124      -        struct smatch_state *new_state;
      144 +        struct range_list *rl;
 125  145  
 126  146          arg = get_argument_from_call_expr(call_expr->args, 0);
 127  147          pre_state = get_state_expr(SMATCH_EXTRA, arg);
 128      -        new_state = estate_filter_range(pre_state, sval_type_min(&long_ctype), ll_to_sval(-4096));
 129      -        new_state = estate_filter_range(new_state, ll_to_sval(0), sval_type_max(&long_ctype));
 130      -        set_extra_expr_nomod(arg, new_state);
      148 +        rl = estate_rl(pre_state);
      149 +        if (!rl)
      150 +                rl = alloc_rl(err_ptr_min, err_ptr_max);
      151 +        rl = rl_intersection(rl, alloc_rl(err_ptr_min, err_ptr_max));
      152 +        rl = cast_rl(get_type(arg), rl);
      153 +        set_extra_expr_nomod(arg, alloc_estate_rl(rl));
 131  154  }
 132  155  
 133  156  static void match_container_of_macro(const char *fn, struct expression *expr, void *unused)
 134  157  {
 135  158          set_extra_expr_mod(expr->left, alloc_estate_range(valid_ptr_min_sval, valid_ptr_max_sval));
 136  159  }
 137  160  
 138  161  static void match_container_of(struct expression *expr)
 139  162  {
 140  163          struct expression *right = expr->right;
↓ open down ↓ 231 lines elided ↑ open up ↑
 372  395                  return;
 373  396          val_sym = first_ptr_list((struct ptr_list *)type->symbol_list);
 374  397          dest = member_expression(dest, '.', val_sym->ident);
 375  398  
 376  399          assign = assign_expression(dest, '=', data);
 377  400          __in_fake_assign++;
 378  401          __split_expr(assign);
 379  402          __in_fake_assign--;
 380  403  }
 381  404  
      405 +bool is_ignored_kernel_data(const char *name)
      406 +{
      407 +        if (option_project != PROJ_KERNEL)
      408 +                return false;
      409 +
      410 +        /*
      411 +         * On the file I was looking at lockdep was 25% of the DB.
      412 +         */
      413 +        if (strstr(name, ".dep_map."))
      414 +                return true;
      415 +        if (strstr(name, ".lockdep_map."))
      416 +                return true;
      417 +        return false;
      418 +}
      419 +
 382  420  void check_kernel(int id)
 383  421  {
 384  422          if (option_project != PROJ_KERNEL)
 385  423                  return;
 386  424  
      425 +        err_ptr_min.type = &ptr_ctype;
      426 +        err_ptr_min.value = -4095;
      427 +        err_ptr_max.type = &ptr_ctype;
      428 +        err_ptr_max.value = -1l;
      429 +        null_ptr.type = &ptr_ctype;
      430 +        null_ptr.value = 0;
      431 +
      432 +        err_ptr_min = sval_cast(&ptr_ctype, err_ptr_min);
      433 +        err_ptr_max = sval_cast(&ptr_ctype, err_ptr_max);
      434 +
 387  435          add_implied_return_hook("ERR_PTR", &implied_err_cast_return, NULL);
 388  436          add_implied_return_hook("ERR_CAST", &implied_err_cast_return, NULL);
 389  437          add_implied_return_hook("PTR_ERR", &implied_err_cast_return, NULL);
 390  438          add_hook(hack_ERR_PTR, AFTER_DEF_HOOK);
 391  439          return_implies_state("IS_ERR_OR_NULL", 0, 0, &match_param_valid_ptr, (void *)0);
 392  440          return_implies_state("IS_ERR_OR_NULL", 1, 1, &match_param_err_or_null, (void *)0);
 393  441          return_implies_state("IS_ERR", 0, 0, &match_not_err, NULL);
 394  442          return_implies_state("IS_ERR", 1, 1, &match_err, NULL);
 395  443          return_implies_state("tomoyo_memory_ok", 1, 1, &match_param_valid_ptr, (void *)0);
 396  444  
↓ open down ↓ 20 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX