target/linux/brcm2708/patches-4.14/950-0151-vcsm-Fix-obscure-conditions.patch

   1 From 92b27d4017371772d0370d1e60a32a9f22224c81 Mon Sep 17 00:00:00 2001
   2 From: Sugizaki Yukimasa <i.can.speak.c.and.basic@gmail.com>
   3 Date: Mon, 8 Jan 2018 21:07:17 +0900
   4 Subject: [PATCH 151/454] vcsm: Fix obscure conditions
   5
   6 Signed-off-by: Sugizaki Yukimasa <i.can.speak.c.and.basic@gmail.com>
   7 ---
   8  drivers/char/broadcom/vc_sm/vmcs_sm.c | 6 +++---
   9  1 file changed, 3 insertions(+), 3 deletions(-)
  10
  11 --- a/drivers/char/broadcom/vc_sm/vmcs_sm.c
  12 +++ b/drivers/char/broadcom/vc_sm/vmcs_sm.c
  13 @@ -278,8 +278,8 @@ static unsigned int vmcs_sm_vc_handle_fr
  14                 list_for_each_entry(map, &sm_state->map_list, map_list) {
  15                         if (map->res_pid != pid)
  16                                 continue;
  17 -                       if (!(map->res_addr <= addr &&
  18 -                                               addr < map->res_addr + map->resource->res_size))
  19 +                       if (addr < map->res_addr ||
  20 +                                               addr >= (map->res_addr + map->resource->res_size))
  21                                 continue;
  22
  23                         pr_debug("[%s]: global map %p (pid %u, addr %lx) -> vc-hdl %x (usr-hdl %x)\n",
  24 @@ -1263,7 +1263,7 @@ static int clean_invalid_mem_2d(const vo
  25         size_t i;
  26         void (*op_fn)(const void*, const void*);
  27
  28 -       if (block_size <= 0) {
  29 +       if (!block_size) {
  30                 pr_err("[%s]: size cannot be 0\n", __func__);
  31                 return -EINVAL;
  32         }