Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 23:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

satcan.c: Fix Unsigned compared against 0 (CID #1399768)

Browse Source 
CID 1399768: Unsigned compared against 0 in satcan_ioctl().

Closes #4294
This commit is contained in:
Ryan Long
2021-03-03 15:52:30 -05:00
committed by Joel Sherrill
parent f804778881
commit 1f29ee4528
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bsps/shared/grlib/can/satcan.c
View File

@@ -239,9 +239,7 @@ static rtems_device_driver satcan_ioctl(rtems_device_major_number major, rtems_d
/* Get regmod structure from argument */ /* Get regmod structure from argument */
regmod = (satcan_regmod*)ioarg->buffer; regmod = (satcan_regmod*)ioarg->buffer;
DBG("SatCAN: ioctl: getting register %d\n\r", regmod->reg); DBG("SatCAN: ioctl: getting register %d\n\r", regmod->reg);
if (regmod->reg < 0) if (regmod->reg <= SATCAN_FILTER_STOP)
return RTEMS_INVALID_NAME;
else if (regmod->reg <= SATCAN_FILTER_STOP)
regmod->val = regs->satcan[regmod->reg]; regmod->val = regs->satcan[regmod->reg];
else if (regmod->reg == SATCAN_WCTRL) else if (regmod->reg == SATCAN_WCTRL)
regmod->val = regs->ctrl; 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; regmod = (satcan_regmod*)ioarg->buffer;
DBG("SatCAN: ioctl: setting register %d, value %x\n\r", DBG("SatCAN: ioctl: setting register %d, value %x\n\r",
regmod->reg, regmod->val); regmod->reg, regmod->val);
if (regmod->reg < 0) if (regmod->reg <= SATCAN_FILTER_STOP)
return RTEMS_INVALID_NAME;
else if (regmod->reg <= SATCAN_FILTER_STOP)
regs->satcan[regmod->reg] = regmod->val; regs->satcan[regmod->reg] = regmod->val;
else if (regmod->reg == SATCAN_WCTRL) else if (regmod->reg == SATCAN_WCTRL)
regs->ctrl = regmod->val; 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; regmod = (satcan_regmod*)ioarg->buffer;
DBG("SatCAN: ioctl: or:ing register %d, with value %x\n\r", DBG("SatCAN: ioctl: or:ing register %d, with value %x\n\r",
regmod->reg, regmod->val); regmod->reg, regmod->val);
if (regmod->reg < 0) if (regmod->reg <= SATCAN_FILTER_STOP)
return RTEMS_INVALID_NAME;
else if (regmod->reg <= SATCAN_FILTER_STOP)
regs->satcan[regmod->reg] |= regmod->val; regs->satcan[regmod->reg] |= regmod->val;
else if (regmod->reg == SATCAN_WCTRL) else if (regmod->reg == SATCAN_WCTRL)
regs->ctrl |= regmod->val; 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; regmod = (satcan_regmod*)ioarg->buffer;
DBG("SatCAN: ioctl: masking register %d, with value %x\n\r", DBG("SatCAN: ioctl: masking register %d, with value %x\n\r",
regmod->reg, regmod->val); regmod->reg, regmod->val);
if (regmod->reg < 0) if (regmod->reg <= SATCAN_FILTER_STOP)
return RTEMS_INVALID_NAME;
else if (regmod->reg <= SATCAN_FILTER_STOP)
regs->satcan[regmod->reg] &= regmod->val; regs->satcan[regmod->reg] &= regmod->val;
else if (regmod->reg == SATCAN_WCTRL) else if (regmod->reg == SATCAN_WCTRL)
regs->ctrl &= regmod->val; regs->ctrl &= regmod->val;