diff options
| author | Josh Oguin <josh.oguin@oarcorp.com> | 2014-11-19 14:28:08 -0600 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-11-26 07:51:57 -0600 |
| commit | 02958c5e530541dab98415553aff69b9eed2d0fa (patch) | |
| tree | 8a28881bc81509d31ec3387ee0f69f4f5c5c73ea | |
| parent | libchip/display/disp_hcms29xx.c: Remove useless variable and check (diff) | |
| download | rtems-02958c5e530541dab98415553aff69b9eed2d0fa.tar.bz2 | |
libchip/serial/ns16550* and z8530*: Assert on baud number to avoid divide by 0
This was flagged by CodeSonar. It should be impossible to get an
incorrect baud number back but ensure this in debug mode. The _Assert()
keeps their scanner from evaluating for divide by 0 past this point.
| -rw-r--r-- | c/src/libchip/serial/ns16550-context.c | 4 | ||||
| -rw-r--r-- | c/src/libchip/serial/ns16550.c | 3 | ||||
| -rw-r--r-- | c/src/libchip/serial/z85c30.c | 8 |
3 files changed, 14 insertions, 1 deletions
diff --git a/c/src/libchip/serial/ns16550-context.c b/c/src/libchip/serial/ns16550-context.c index 00ad89c2e9..087627a1f7 100644 --- a/c/src/libchip/serial/ns16550-context.c +++ b/c/src/libchip/serial/ns16550-context.c @@ -592,9 +592,13 @@ static bool ns16550_set_attributes( /* * Calculate the baud rate divisor + * + * Assert ensures there is no division by 0. */ baud_requested = rtems_termios_baud_to_number(t->c_cflag); + _Assert( baud_requested != 0 ); + ulBaudDivisor = NS16550_GetBaudDivisor(ctx, baud_requested); ucLineControl = 0; diff --git a/c/src/libchip/serial/ns16550.c b/c/src/libchip/serial/ns16550.c index 2c3bc9496e..801533b631 100644 --- a/c/src/libchip/serial/ns16550.c +++ b/c/src/libchip/serial/ns16550.c @@ -532,9 +532,12 @@ int ns16550_set_attributes( /* * Calculate the baud rate divisor + * + * Assert ensures there is no division by 0. */ baud_requested = rtems_termios_baud_to_number(t->c_cflag); + _Assert( baud_requested != 0 ); ulBaudDivisor = NS16550_GetBaudDivisor(c, baud_requested); ucLineControl = 0; diff --git a/c/src/libchip/serial/z85c30.c b/c/src/libchip/serial/z85c30.c index 4b1b4227b6..1f43271dd0 100644 --- a/c/src/libchip/serial/z85c30.c +++ b/c/src/libchip/serial/z85c30.c @@ -437,6 +437,7 @@ Z85C30_STATIC int z85c30_set_attributes( uint32_t wr4; uint32_t wr5; int baud_requested; + uint32_t baud_number; setRegister_f setReg; rtems_interrupt_level Irql; @@ -445,15 +446,20 @@ Z85C30_STATIC int z85c30_set_attributes( /* * Calculate the baud rate divisor + * + * Assert ensures there is no division by 0. */ baud_requested = t->c_cflag & CBAUD; if (!baud_requested) baud_requested = B9600; /* default to 9600 baud */ + baud_number = (uint32_t) rtems_termios_baud_to_number( baud_requested ); + _Assert( baud_number != 0 ); + ulBaudDivisor = Z85C30_Baud( (uint32_t) Console_Port_Tbl[minor]->ulClock, - (uint32_t) rtems_termios_baud_to_number( baud_requested ) + baud_number ); wr3 = SCC_WR3_RX_EN; |