sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CC3000 Fix: Data can be unaligned. When dereferences as an input ntosh(), a bad value is returned. Reported by Alan Carvalho de Assis

Browse Source
This commit is contained in:
Gregory Nutt 2014-12-18 07:18:00 -06:00
parent a775933afa
commit 2fe506d70c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/wireless/cc3000/cc3000.c
View File

@ -671,12 +671,17 @@ static void * cc3000_worker(FAR void *arg)
cc3000_lock_and_select(priv->spi); /* Assert CS */
priv->state = eSPI_STATE_READ_PROCEED;
SPI_EXCHANGE(priv->spi,spi_readCommand,priv->rx_buffer.pbuffer, ARRAY_SIZE(spi_readCommand));
SPI_EXCHANGE(priv->spi,spi_readCommand, priv->rx_buffer.pbuffer,
ARRAY_SIZE(spi_readCommand));
/* Extract Length bytes from Rx Buffer */
/* Extract Length bytes from Rx Buffer. Here we need to convert
* unaligned data in network order (big endian, MS byte first) to
* host order. We cannot use ntohs here because the data is not
* aligned.
*/
uint16_t *pnetlen = (uint16_t *) &priv->rx_buffer.pbuffer[READ_OFFSET_TO_LENGTH];
data_to_recv = ntohs(*pnetlen);
data_to_recv = (uint16_t)priv->rx_buffer.pbuffer[READ_OFFSET_TO_LENGTH] << 8 |;
(uint16_t)priv->rx_buffer.pbuffer[READ_OFFSET_TO_LENGTH];
if (data_to_recv)
{