random-mirrors/amazingfate-rtl8723ds
1
0
Fork 0
mirror of https://github.com/amazingfate/rtl8723ds.git synced 2026-06-18 18:29:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

rtl8723ds: Fix Sparse errors/warnings in core/rtw_security.c

Browse Source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
2017-10-27 14:53:08 -05:00
parent 426d23f60f
commit ef471acce1
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/rtw_security.c
+22 -22
View File
@@ -210,10 +210,11 @@ exit:
return; return;
} }
static u32 getcrc32(u8 *buf, sint len) static __le32 getcrc32(u8 *buf, sint len)
{ {
u8 *p; u8 *p;
u32 crc; u32 crc;
if (bcrc32initialized == 0) if (bcrc32initialized == 0)
crc32_init(); crc32_init();
@@ -221,7 +222,7 @@ static u32 getcrc32(u8 *buf, sint len)
for (p = buf; len > 0; ++p, --len) for (p = buf; len > 0; ++p, --len)
crc = crc32_table[(crc ^ *p) & 0xff] ^ (crc >> 8); crc = crc32_table[(crc ^ *p) & 0xff] ^ (crc >> 8);
return ~crc; /* transmit complement, per CRC-32 spec */ return cpu_to_le32(~crc); /* transmit complement, per CRC-32 spec */
} }
@@ -278,7 +279,7 @@ void rtw_wep_encrypt(_adapter *padapter, u8 *pxmitframe)
length = pattrib->last_txcmdsz - pattrib->hdrlen - pattrib->iv_len - pattrib->icv_len; length = pattrib->last_txcmdsz - pattrib->hdrlen - pattrib->iv_len - pattrib->icv_len;
*((__le32 *)crc) = cpu_to_le32(getcrc32(payload, length)); *((__le32 *)crc) = getcrc32(payload, length);
arcfour_init(&mycontext, wepkey, 3 + keylength); arcfour_init(&mycontext, wepkey, 3 + keylength);
arcfour_encrypt(&mycontext, payload, payload, length); arcfour_encrypt(&mycontext, payload, payload, length);
@@ -286,7 +287,7 @@ void rtw_wep_encrypt(_adapter *padapter, u8 *pxmitframe)
} else { } else {
length = pxmitpriv->frag_len - pattrib->hdrlen - pattrib->iv_len - pattrib->icv_len ; length = pxmitpriv->frag_len - pattrib->hdrlen - pattrib->iv_len - pattrib->icv_len ;
*((__le32 *)crc) = cpu_to_le32(getcrc32(payload, length)); *((__le32 *)crc) = getcrc32(payload, length);
arcfour_init(&mycontext, wepkey, 3 + keylength); arcfour_init(&mycontext, wepkey, 3 + keylength);
arcfour_encrypt(&mycontext, payload, payload, length); arcfour_encrypt(&mycontext, payload, payload, length);
arcfour_encrypt(&mycontext, payload + length, crc, 4); arcfour_encrypt(&mycontext, payload + length, crc, 4);
@@ -337,7 +338,7 @@ void rtw_wep_decrypt(_adapter *padapter, u8 *precvframe)
arcfour_encrypt(&mycontext, payload, payload, length); arcfour_encrypt(&mycontext, payload, payload, length);
/* calculate icv and compare the icv */ /* calculate icv and compare the icv */
*((__le32 *)crc) = le32_to_cpu(getcrc32(payload, length - 4)); *((__le32 *)crc) = getcrc32(payload, length - 4);
WEP_SW_DEC_CNT_INC(psecuritypriv, prxattrib->ra); WEP_SW_DEC_CNT_INC(psecuritypriv, prxattrib->ra);
@@ -761,7 +762,7 @@ u32 rtw_tkip_encrypt(_adapter *padapter, u8 *pxmitframe)
if ((curfragnum + 1) == pattrib->nr_frags) { /* 4 the last fragment */ if ((curfragnum + 1) == pattrib->nr_frags) { /* 4 the last fragment */
length = pattrib->last_txcmdsz - pattrib->hdrlen - pattrib->iv_len - pattrib->icv_len; length = pattrib->last_txcmdsz - pattrib->hdrlen - pattrib->iv_len - pattrib->icv_len;
*((__le32 *)crc) = cpu_to_le32(getcrc32(payload, length)); /* modified by Amy*/ *((__le32 *)crc) = getcrc32(payload, length); /* modified by Amy*/
arcfour_init(&mycontext, rc4key, 16); arcfour_init(&mycontext, rc4key, 16);
arcfour_encrypt(&mycontext, payload, payload, length); arcfour_encrypt(&mycontext, payload, payload, length);
@@ -769,7 +770,7 @@ u32 rtw_tkip_encrypt(_adapter *padapter, u8 *pxmitframe)
} else { } else {
length = pxmitpriv->frag_len - pattrib->hdrlen - pattrib->iv_len - pattrib->icv_len ; length = pxmitpriv->frag_len - pattrib->hdrlen - pattrib->iv_len - pattrib->icv_len ;
*((__le32 *)crc) = cpu_to_le32(getcrc32(payload, length)); /* modified by Amy*/ *((__le32 *)crc) = getcrc32(payload, length); /* modified by Amy*/
arcfour_init(&mycontext, rc4key, 16); arcfour_init(&mycontext, rc4key, 16);
arcfour_encrypt(&mycontext, payload, payload, length); arcfour_encrypt(&mycontext, payload, payload, length);
arcfour_encrypt(&mycontext, payload + length, crc, 4); arcfour_encrypt(&mycontext, payload + length, crc, 4);
@@ -887,7 +888,7 @@ u32 rtw_tkip_decrypt(_adapter *padapter, u8 *precvframe)
arcfour_init(&mycontext, rc4key, 16); arcfour_init(&mycontext, rc4key, 16);
arcfour_encrypt(&mycontext, payload, payload, length); arcfour_encrypt(&mycontext, payload, payload, length);
*((__le32 *)crc) = le32_to_cpu(getcrc32(payload, length - 4)); *((__le32 *)crc) = getcrc32(payload, length - 4);
if (crc[3] != payload[length - 1] || crc[2] != payload[length - 2] || crc[1] != payload[length - 3] || crc[0] != payload[length - 4]) { if (crc[3] != payload[length - 1] || crc[2] != payload[length - 2] || crc[1] != payload[length - 3] || crc[0] != payload[length - 4]) {
res = _FAIL; res = _FAIL;
@@ -961,12 +962,12 @@ static void construct_mic_iv(
u8 *mpdu, u8 *mpdu,
uint payload_length, uint payload_length,
u8 *pn_vector, u8 *pn_vector,
uint frtype);/* add for CONFIG_IEEE80211W, none 11w also can use */ u16 frtype);/* add for CONFIG_IEEE80211W, none 11w also can use */
static void construct_mic_header1( static void construct_mic_header1(
u8 *mic_header1, u8 *mic_header1,
sint header_length, sint header_length,
u8 *mpdu, u8 *mpdu,
uint frtype);/* add for CONFIG_IEEE80211W, none 11w also can use */ u16 frtype);/* add for CONFIG_IEEE80211W, none 11w also can use */
static void construct_mic_header2( static void construct_mic_header2(
u8 *mic_header2, u8 *mic_header2,
u8 *mpdu, u8 *mpdu,
@@ -979,7 +980,7 @@ static void construct_ctr_preload(
u8 *mpdu, u8 *mpdu,
u8 *pn_vector, u8 *pn_vector,
sint c, sint c,
uint frtype);/* add for CONFIG_IEEE80211W, none 11w also can use */ u16 frtype);/* add for CONFIG_IEEE80211W, none 11w also can use */
static void xor_128(u8 *a, u8 *b, u8 *out); static void xor_128(u8 *a, u8 *b, u8 *out);
static void xor_32(u8 *a, u8 *b, u8 *out); static void xor_32(u8 *a, u8 *b, u8 *out);
static u8 sbox(u8 a); static u8 sbox(u8 a);
@@ -1177,7 +1178,7 @@ static void construct_mic_iv(
u8 *mpdu, u8 *mpdu,
uint payload_length, uint payload_length,
u8 *pn_vector, u8 *pn_vector,
uint frtype/* add for CONFIG_IEEE80211W, none 11w also can use */ u16 frtype/* add for CONFIG_IEEE80211W, none 11w also can use */
) )
{ {
sint i; sint i;
@@ -1217,7 +1218,7 @@ static void construct_mic_header1(
u8 *mic_header1, u8 *mic_header1,
sint header_length, sint header_length,
u8 *mpdu, u8 *mpdu,
uint frtype/* add for CONFIG_IEEE80211W, none 11w also can use */ u16 frtype/* add for CONFIG_IEEE80211W, none 11w also can use */
) )
{ {
mic_header1[0] = (u8)((header_length - 2) / 256); mic_header1[0] = (u8)((header_length - 2) / 256);
@@ -1310,7 +1311,7 @@ static void construct_ctr_preload(
u8 *mpdu, u8 *mpdu,
u8 *pn_vector, u8 *pn_vector,
sint c, sint c,
uint frtype /* add for CONFIG_IEEE80211W, none 11w also can use */ u16 frtype /* add for CONFIG_IEEE80211W, none 11w also can use */
) )
{ {
sint i = 0; sint i = 0;
@@ -1373,8 +1374,8 @@ static sint aes_cipher(u8 *key, uint hdrlen,
u8 padded_buffer[16]; u8 padded_buffer[16];
u8 mic[8]; u8 mic[8];
/* uint offset = 0; */ /* uint offset = 0; */
__le16 frtype = GetFrameType(pframe); u16 frtype = GetFrameType(pframe);
__le16 frsubtype = GetFrameSubType(pframe); u16 frsubtype = GetFrameSubType(pframe);
frsubtype = frsubtype >> 4; frsubtype = frsubtype >> 4;
@@ -1682,9 +1683,8 @@ static sint aes_decipher(u8 *key, uint hdrlen,
/* uint offset = 0; */ /* uint offset = 0; */
__le16 frtype = GetFrameType(pframe); u16 frtype = GetFrameType(pframe);
__le16 frsubtype = GetFrameSubType(pframe); u16 frsubtype = GetFrameSubType(pframe) >> 4;
frsubtype = frsubtype >> 4;
_rtw_memset((void *)mic_iv, 0, 16); _rtw_memset((void *)mic_iv, 0, 16);
@@ -1722,11 +1722,11 @@ static sint aes_decipher(u8 *key, uint hdrlen,
hdrlen += 2; hdrlen += 2;
} /* only for data packet . add for CONFIG_IEEE80211W, none 11w also can use */ } /* only for data packet . add for CONFIG_IEEE80211W, none 11w also can use */
else if ((frtype == WIFI_DATA) && else if ((frtype == WIFI_DATA &&
((frsubtype == 0x08) || (frsubtype == 0x08)) ||
(frsubtype == 0x09) || (frsubtype == 0x09) ||
(frsubtype == 0x0a) || (frsubtype == 0x0a) ||
(frsubtype == 0x0b))) { (frsubtype == 0x0b)) {
if (hdrlen != WLAN_HDR_A3_QOS_LEN) if (hdrlen != WLAN_HDR_A3_QOS_LEN)
hdrlen += 2; hdrlen += 2;
include/wifi.h
+2 -2
View File
@@ -360,7 +360,7 @@ enum WIFI_REG_DOMAIN {
#define GetOrder(pbuf) (((*(unsigned short *)(pbuf)) & le16_to_cpu(_ORDER_)) != 0) #define GetOrder(pbuf) (((*(unsigned short *)(pbuf)) & le16_to_cpu(_ORDER_)) != 0)
#define GetFrameType(pbuf) (le16_to_cpu(*(unsigned short *)(pbuf)) & (BIT(3) | BIT(2))) #define GetFrameType(pbuf) (le16_to_cpu(*(__le16 *)(pbuf)) & (BIT(3) | BIT(2)))
#define SetFrameType(pbuf, type) \ #define SetFrameType(pbuf, type) \
do { \ do { \
@@ -368,7 +368,7 @@ enum WIFI_REG_DOMAIN {
*(__le16 *)(pbuf) |= __constant_cpu_to_le16(type); \ *(__le16 *)(pbuf) |= __constant_cpu_to_le16(type); \
} while (0) } while (0)
#define GetFrameSubType(pbuf) (cpu_to_le16(*(__le16 *)(pbuf)) & (BIT(7) | BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2))) #define GetFrameSubType(pbuf) (le16_to_cpu(*(__le16 *)(pbuf)) & (BIT(7) | BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2)))
#define SetFrameSubType(pbuf, type) \ #define SetFrameSubType(pbuf, type) \
do { \ do { \