diff options
| author | Ryan Long <ryan.long@oarcorp.com> | 2021-03-03 15:52:30 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel@rtems.org> | 2021-03-05 14:00:07 -0600 |
| commit | 1f29ee4528290cd516be551c0ff7e945d6567390 (patch) | |
| tree | ad5bbf5d58d66610b45932e745f9b3f46a93bc9b | |
| parent | gr_cpci_gr740.c: Unchecked return value from library (CID #1437630) (diff) | |
| download | rtems-1f29ee4528290cd516be551c0ff7e945d6567390.tar.bz2 | |
satcan.c: Fix Unsigned compared against 0 (CID #1399768)
CID 1399768: Unsigned compared against 0 in satcan_ioctl().
Closes #4294
| -rw-r--r-- | bsps/shared/grlib/can/satcan.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/bsps/shared/grlib/can/satcan.c b/bsps/shared/grlib/can/satcan.c index c3fdc158e3..52e674cb04 100644 --- a/bsps/shared/grlib/can/satcan.c +++ b/bsps/shared/grlib/can/satcan.c @@ -239,9 +239,7 @@ static rtems_device_driver satcan_ioctl(rtems_device_major_number major, rtems_d /* Get regmod structure from argument */ regmod = (satcan_regmod*)ioarg->buffer; DBG("SatCAN: ioctl: getting register %d\n\r", regmod->reg); - if (regmod->reg < 0) - return RTEMS_INVALID_NAME; - else if (regmod->reg <= SATCAN_FILTER_STOP) + if (regmod->reg <= SATCAN_FILTER_STOP) regmod->val = regs->satcan[regmod->reg]; else if (regmod->reg == SATCAN_WCTRL) regmod->val = regs->ctrl; @@ -260,9 +258,7 @@ static rtems_device_driver satcan_ioctl(rtems_device_major_number major, rtems_d regmod = (satcan_regmod*)ioarg->buffer; DBG("SatCAN: ioctl: setting register %d, value %x\n\r", regmod->reg, regmod->val); - if (regmod->reg < 0) - return RTEMS_INVALID_NAME; - else if (regmod->reg <= SATCAN_FILTER_STOP) + if (regmod->reg <= SATCAN_FILTER_STOP) regs->satcan[regmod->reg] = regmod->val; else if (regmod->reg == SATCAN_WCTRL) regs->ctrl = regmod->val; @@ -281,9 +277,7 @@ static rtems_device_driver satcan_ioctl(rtems_device_major_number major, rtems_d regmod = (satcan_regmod*)ioarg->buffer; DBG("SatCAN: ioctl: or:ing register %d, with value %x\n\r", regmod->reg, regmod->val); - if (regmod->reg < 0) - return RTEMS_INVALID_NAME; - else if (regmod->reg <= SATCAN_FILTER_STOP) + if (regmod->reg <= SATCAN_FILTER_STOP) regs->satcan[regmod->reg] |= regmod->val; else if (regmod->reg == SATCAN_WCTRL) regs->ctrl |= regmod->val; @@ -302,9 +296,7 @@ static rtems_device_driver satcan_ioctl(rtems_device_major_number major, rtems_d regmod = (satcan_regmod*)ioarg->buffer; DBG("SatCAN: ioctl: masking register %d, with value %x\n\r", regmod->reg, regmod->val); - if (regmod->reg < 0) - return RTEMS_INVALID_NAME; - else if (regmod->reg <= SATCAN_FILTER_STOP) + if (regmod->reg <= SATCAN_FILTER_STOP) regs->satcan[regmod->reg] &= regmod->val; else if (regmod->reg == SATCAN_WCTRL) regs->ctrl &= regmod->val; |