Merge pull request #5505 from LMESTM/fix_smartcard_HAL

0xc0170 · web-flow · commit dc6dd5961e53 · 2017-11-16T16:11:04.000Z
STM32: HAL smartcard, fix memory corruption in Receive
diff --git a/targets/TARGET_STM/TARGET_STM32F1/device/stm32f1xx_hal_smartcard.c b/targets/TARGET_STM/TARGET_STM32F1/device/stm32f1xx_hal_smartcard.c
@@ -500,7 +500,6 @@ HAL_StatusTypeDef HAL_SMARTCARD_Transmit(SMARTCARD_HandleTypeDef *hsc, uint8_t *
   */
 HAL_StatusTypeDef HAL_SMARTCARD_Receive(SMARTCARD_HandleTypeDef *hsc, uint8_t *pData, uint16_t Size, uint32_t Timeout)
 {
-  uint16_t* tmp;
   uint32_t tickstart = 0U;
   
   if(hsc->RxState == HAL_SMARTCARD_STATE_READY)
@@ -530,8 +529,7 @@ HAL_StatusTypeDef HAL_SMARTCARD_Receive(SMARTCARD_HandleTypeDef *hsc, uint8_t *p
       {
         return HAL_TIMEOUT;
       }
-      tmp = (uint16_t*) pData;
-      *tmp = (uint8_t)(hsc->Instance->DR & (uint8_t)0xFF);
+      *pData = (uint8_t)(hsc->Instance->DR & (uint8_t)0xFF);
       pData +=1U;
     }
 
diff --git a/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_smartcard.c b/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_smartcard.c
@@ -496,7 +496,6 @@ HAL_StatusTypeDef HAL_SMARTCARD_Transmit(SMARTCARD_HandleTypeDef *hsc, uint8_t *
   */
 HAL_StatusTypeDef HAL_SMARTCARD_Receive(SMARTCARD_HandleTypeDef *hsc, uint8_t *pData, uint16_t Size, uint32_t Timeout)
 {
-  uint16_t* tmp;
   uint32_t tickstart = 0U;
   
   if(hsc->RxState == HAL_SMARTCARD_STATE_READY) 
@@ -526,8 +525,7 @@ HAL_StatusTypeDef HAL_SMARTCARD_Receive(SMARTCARD_HandleTypeDef *hsc, uint8_t *p
       {
         return HAL_TIMEOUT;
       }
-      tmp = (uint16_t*) pData;
-      *tmp = (uint8_t)(hsc->Instance->DR & (uint8_t)0xFF);
+      *pData = (uint8_t)(hsc->Instance->DR & (uint8_t)0xFF);
       pData +=1U;
     }
 
diff --git a/targets/TARGET_STM/TARGET_STM32F4/device/stm32f4xx_hal_smartcard.c b/targets/TARGET_STM/TARGET_STM32F4/device/stm32f4xx_hal_smartcard.c
@@ -497,7 +497,6 @@ HAL_StatusTypeDef HAL_SMARTCARD_Transmit(SMARTCARD_HandleTypeDef *hsc, uint8_t *
   */
 HAL_StatusTypeDef HAL_SMARTCARD_Receive(SMARTCARD_HandleTypeDef *hsc, uint8_t *pData, uint16_t Size, uint32_t Timeout)
 {
-  uint16_t* tmp;
   uint32_t tickstart = 0U;
   
   if(hsc->RxState == HAL_SMARTCARD_STATE_READY) 
@@ -527,8 +526,7 @@ HAL_StatusTypeDef HAL_SMARTCARD_Receive(SMARTCARD_HandleTypeDef *hsc, uint8_t *p
       {
         return HAL_TIMEOUT;
       }
-      tmp = (uint16_t*) pData;
-      *tmp = (uint8_t)(hsc->Instance->DR & (uint8_t)0xFF);
+      *pData = (uint8_t)(hsc->Instance->DR & (uint8_t)0xFF);
       pData +=1U;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,6 @@ HAL_StatusTypeDef HAL_SMARTCARD_Transmit(SMARTCARD_HandleTypeDef hsc, uint8_t `
`500`	`500`	`*/`
`501`	`501`	`HAL_StatusTypeDef HAL_SMARTCARD_Receive(SMARTCARD_HandleTypeDef hsc, uint8_t pData, uint16_t Size, uint32_t Timeout)`
`502`	`502`	`{`
`503`		`- uint16_t* tmp;`
`504`	`503`	`uint32_t tickstart = 0U;`
`505`	`504`
`506`	`505`	`if(hsc->RxState == HAL_SMARTCARD_STATE_READY)`
`@@ -530,8 +529,7 @@ HAL_StatusTypeDef HAL_SMARTCARD_Receive(SMARTCARD_HandleTypeDef hsc, uint8_t p`
`530`	`529`	`{`
`531`	`530`	`return HAL_TIMEOUT;`
`532`	`531`	`}`
`533`		`- tmp = (uint16_t*) pData;`
`534`		`- *tmp = (uint8_t)(hsc->Instance->DR & (uint8_t)0xFF);`
	`532`	`+ *pData = (uint8_t)(hsc->Instance->DR & (uint8_t)0xFF);`
`535`	`533`	`pData +=1U;`
`536`	`534`	`}`
`537`	`535`
Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,6 @@ HAL_StatusTypeDef HAL_SMARTCARD_Transmit(SMARTCARD_HandleTypeDef hsc, uint8_t `
`496`	`496`	`*/`
`497`	`497`	`HAL_StatusTypeDef HAL_SMARTCARD_Receive(SMARTCARD_HandleTypeDef hsc, uint8_t pData, uint16_t Size, uint32_t Timeout)`
`498`	`498`	`{`
`499`		`- uint16_t* tmp;`
`500`	`499`	`uint32_t tickstart = 0U;`
`501`	`500`
`502`	`501`	`if(hsc->RxState == HAL_SMARTCARD_STATE_READY)`
`@@ -526,8 +525,7 @@ HAL_StatusTypeDef HAL_SMARTCARD_Receive(SMARTCARD_HandleTypeDef hsc, uint8_t p`
`526`	`525`	`{`
`527`	`526`	`return HAL_TIMEOUT;`
`528`	`527`	`}`
`529`		`- tmp = (uint16_t*) pData;`
`530`		`- *tmp = (uint8_t)(hsc->Instance->DR & (uint8_t)0xFF);`
	`528`	`+ *pData = (uint8_t)(hsc->Instance->DR & (uint8_t)0xFF);`
`531`	`529`	`pData +=1U;`
`532`	`530`	`}`
`533`	`531`
Original file line number	Diff line number	Diff line change
`@@ -497,7 +497,6 @@ HAL_StatusTypeDef HAL_SMARTCARD_Transmit(SMARTCARD_HandleTypeDef hsc, uint8_t `
`497`	`497`	`*/`
`498`	`498`	`HAL_StatusTypeDef HAL_SMARTCARD_Receive(SMARTCARD_HandleTypeDef hsc, uint8_t pData, uint16_t Size, uint32_t Timeout)`
`499`	`499`	`{`
`500`		`- uint16_t* tmp;`
`501`	`500`	`uint32_t tickstart = 0U;`
`502`	`501`
`503`	`502`	`if(hsc->RxState == HAL_SMARTCARD_STATE_READY)`
`@@ -527,8 +526,7 @@ HAL_StatusTypeDef HAL_SMARTCARD_Receive(SMARTCARD_HandleTypeDef hsc, uint8_t p`
`527`	`526`	`{`
`528`	`527`	`return HAL_TIMEOUT;`
`529`	`528`	`}`
`530`		`- tmp = (uint16_t*) pData;`
`531`		`- *tmp = (uint8_t)(hsc->Instance->DR & (uint8_t)0xFF);`
	`529`	`+ *pData = (uint8_t)(hsc->Instance->DR & (uint8_t)0xFF);`
`532`	`530`	`pData +=1U;`
`533`	`531`	`}`
`534`	`532`