Re: [PATCH] type assignment and restricted type cast error fixes for rtl8723au/core/rtw_security.c

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 08/09/2015 12:22 PM, Jacob Kiefer wrote:
This patch fixes the following sparse errors:

   CHECK   drivers/staging/rtl8723au/core/rtw_security.c
drivers/staging/rtl8723au/core/rtw_security.c:189:39: \
   warning: incorrect type in assignment (different base types)
drivers/staging/rtl8723au/core/rtw_security.c:189:39:    \
   expected unsigned int [unsigned] [usertype] <noident>
drivers/staging/rtl8723au/core/rtw_security.c:189:39:    \
   got restricted __le32 [usertype] <noident>
drivers/staging/rtl8723au/core/rtw_security.c:197:39: \
   warning: incorrect type in assignment (different base types)
drivers/staging/rtl8723au/core/rtw_security.c:197:39:    \
   expected unsigned int [unsigned] [usertype] <noident>
drivers/staging/rtl8723au/core/rtw_security.c:197:39:    \
   got restricted __le32 [usertype] <noident>
drivers/staging/rtl8723au/core/rtw_security.c:246:22: \
   warning: cast to restricted __le32
drivers/staging/rtl8723au/core/rtw_security.c:247:24: \
   warning: cast to restricted __le32
drivers/staging/rtl8723au/core/rtw_security.c:682:39: \
   warning: incorrect type in assignment (different base types)
drivers/staging/rtl8723au/core/rtw_security.c:682:39:    \
   expected unsigned int [unsigned] [usertype] <noident>
drivers/staging/rtl8723au/core/rtw_security.c:682:39:    \
   got restricted __le32 [usertype] <noident>
drivers/staging/rtl8723au/core/rtw_security.c:694:39: \
   warning: incorrect type in assignment (different base types)
drivers/staging/rtl8723au/core/rtw_security.c:694:39:    \
   expected unsigned int [unsigned] [usertype] <noident>
drivers/staging/rtl8723au/core/rtw_security.c:694:39:    \
   got restricted __le32 [usertype] <noident>
drivers/staging/rtl8723au/core/rtw_security.c:772:22: \
   warning: cast to restricted __le32
drivers/staging/rtl8723au/core/rtw_security.c:773:24: \
   warning: cast to restricted __le32

Signed-off-by: Jacob Kiefer <jtk54@xxxxxxxxxxx>
---
  drivers/staging/rtl8723au/core/rtw_security.c | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)

The subject needs work. I recommend "staging: rtl8723au: Fix Sparse errors in rtw_security.c".

You may be clearing the Sparse errors, but I think you are creating real errors in the code! The output of getcrc32 needs to be converted to __le32 before transmission. On a little-endian machine, it wont make any difference in the code, but for big-endian systems, it will.


diff --git a/drivers/staging/rtl8723au/core/rtw_security.c b/drivers/staging/rtl8723au/core/rtw_security.c
index af53c92..004e7c9 100644
--- a/drivers/staging/rtl8723au/core/rtw_security.c
+++ b/drivers/staging/rtl8723au/core/rtw_security.c
@@ -186,7 +186,7 @@ void rtw_wep_encrypt23a(struct rtw_adapter *padapter,
  			length = pattrib->last_txcmdsz - pattrib->hdrlen -
  				pattrib->iv_len - pattrib->icv_len;

-			*((u32 *)crc) = cpu_to_le32(getcrc32(payload, length));
+			*((u32 *)crc) = getcrc32(payload, length);

Here, you need to leave the cpu_to_le32() call alone, and worry about the type of crc. It should be __le32, and the cast will no longer be necessary.


  			arcfour_init(&mycontext, wepkey, 3 + keylength);
  			arcfour_encrypt(&mycontext, payload, payload, length);
@@ -194,7 +194,7 @@ void rtw_wep_encrypt23a(struct rtw_adapter *padapter,
  		} else {
  			length = pxmitpriv->frag_len - pattrib->hdrlen -
  				pattrib->iv_len - pattrib->icv_len;
-			*((u32 *)crc) = cpu_to_le32(getcrc32(payload, length));
+			*((u32 *)crc) = getcrc32(payload, length);

Ditto here.

  			arcfour_init(&mycontext, wepkey, 3 + keylength);
  			arcfour_encrypt(&mycontext, payload, payload, length);
  			arcfour_encrypt(&mycontext, payload + length, crc, 4);
@@ -243,8 +243,8 @@ void rtw_wep_decrypt23a(struct rtw_adapter *padapter,
  	arcfour_encrypt(&mycontext, payload, payload, length);

  	/* calculate icv and compare the icv */
-	actual_crc = le32_to_cpu(getcrc32(payload, length - 4));
-	expected_crc = le32_to_cpu(get_unaligned_le32(&payload[length - 4]));
+	actual_crc = getcrc32(payload, length - 4);
+	expected_crc = get_unaligned_le32(&payload[length - 4]);

  	if (actual_crc != expected_crc) {
  		RT_TRACE(_module_rtl871x_security_c_, _drv_err_,
@@ -679,7 +679,7 @@ int rtw_tkip_encrypt23a(struct rtw_adapter *padapter,
  				 "pattrib->iv_len =%x, pattrib->icv_len =%x\n",
  				 pattrib->iv_len,
  				 pattrib->icv_len);
-			*((u32 *)crc) = cpu_to_le32(getcrc32(payload, length));
+			*((u32 *)crc) = getcrc32(payload, length);

Ditto.


  			arcfour_init(&mycontext, rc4key, 16);
  			arcfour_encrypt(&mycontext, payload, payload, length);
@@ -691,7 +691,7 @@ int rtw_tkip_encrypt23a(struct rtw_adapter *padapter,
  				  pattrib->iv_len -
  				  pattrib->icv_len);

-			*((u32 *)crc) = cpu_to_le32(getcrc32(payload, length));
+			*((u32 *)crc) = getcrc32(payload, length);

Ditto.

  			arcfour_init(&mycontext, rc4key, 16);
  			arcfour_encrypt(&mycontext, payload, payload, length);
  			arcfour_encrypt(&mycontext, payload + length, crc, 4);
@@ -769,8 +769,8 @@ int rtw_tkip_decrypt23a(struct rtw_adapter *padapter,
  	arcfour_init(&mycontext, rc4key, 16);
  	arcfour_encrypt(&mycontext, payload, payload, length);

-	actual_crc = le32_to_cpu(getcrc32(payload, length - 4));
-	expected_crc = le32_to_cpu(get_unaligned_le32(&payload[length - 4]));
+	actual_crc = getcrc32(payload, length - 4);
+	expected_crc = get_unaligned_le32(&payload[length - 4]);

  	if (actual_crc != expected_crc) {
  		RT_TRACE(_module_rtl871x_security_c_, _drv_err_,


Larry

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel



[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux