linux-kernel - [PATCH] staging: rtl8192u: Fix type mismatch warnings reported by sparse

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Mon,  1 May 2017 13:19:24 +0530
From:   suniel.spartan@...il.com
To:     gregkh@...uxfoundation.org
Cc:     linux-kernel@...r.kernel.org, devel@...verdev.osuosl.org,
        sunil.m@...hveda.org, Suniel Mahesh <suniel.spartan@...il.com>
Subject: [PATCH] staging: rtl8192u: Fix type mismatch warnings reported by sparse

From: Suniel Mahesh <suniel.spartan@...il.com>

The function Mk16_le() is calling le16_to_cpu() internally.
le16_to_cpu() takes an argument of type (__le *) but the argument
passed is of type (u16 *). Fixed it by passing the correct argument.

Signed-off-by: Suniel Mahesh <suniel.spartan@...il.com>
---
 .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c      | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
index 5039172..11ddf30 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
@@ -172,7 +172,7 @@ static inline u16 Mk16(u8 hi, u8 lo)
 }
 
 
-static inline u16 Mk16_le(u16 *v)
+static inline u16 Mk16_le(__le16 *v)
 {
 	return le16_to_cpu(*v);
 }
@@ -264,15 +264,15 @@ static void tkip_mixing_phase2(u8 *WEPSeed, const u8 *TK, const u16 *TTAK,
 	PPK[5] = TTAK[4] + IV16;
 
 	/* Step 2 - 96-bit bijective mixing using S-box */
-	PPK[0] += _S_(PPK[5] ^ Mk16_le((u16 *) &TK[0]));
-	PPK[1] += _S_(PPK[0] ^ Mk16_le((u16 *) &TK[2]));
-	PPK[2] += _S_(PPK[1] ^ Mk16_le((u16 *) &TK[4]));
-	PPK[3] += _S_(PPK[2] ^ Mk16_le((u16 *) &TK[6]));
-	PPK[4] += _S_(PPK[3] ^ Mk16_le((u16 *) &TK[8]));
-	PPK[5] += _S_(PPK[4] ^ Mk16_le((u16 *) &TK[10]));
-
-	PPK[0] += RotR1(PPK[5] ^ Mk16_le((u16 *) &TK[12]));
-	PPK[1] += RotR1(PPK[0] ^ Mk16_le((u16 *) &TK[14]));
+	PPK[0] += _S_(PPK[5] ^ Mk16_le((__le16 *)&TK[0]));
+	PPK[1] += _S_(PPK[0] ^ Mk16_le((__le16 *)&TK[2]));
+	PPK[2] += _S_(PPK[1] ^ Mk16_le((__le16 *)&TK[4]));
+	PPK[3] += _S_(PPK[2] ^ Mk16_le((__le16 *)&TK[6]));
+	PPK[4] += _S_(PPK[3] ^ Mk16_le((__le16 *)&TK[8]));
+	PPK[5] += _S_(PPK[4] ^ Mk16_le((__le16 *)&TK[10]));
+
+	PPK[0] += RotR1(PPK[5] ^ Mk16_le((__le16 *)&TK[12]));
+	PPK[1] += RotR1(PPK[0] ^ Mk16_le((__le16 *)&TK[14]));
 	PPK[2] += RotR1(PPK[1]);
 	PPK[3] += RotR1(PPK[2]);
 	PPK[4] += RotR1(PPK[3]);
@@ -285,7 +285,7 @@ static void tkip_mixing_phase2(u8 *WEPSeed, const u8 *TK, const u16 *TTAK,
 	WEPSeed[0] = Hi8(IV16);
 	WEPSeed[1] = (Hi8(IV16) | 0x20) & 0x7F;
 	WEPSeed[2] = Lo8(IV16);
-	WEPSeed[3] = Lo8((PPK[5] ^ Mk16_le((u16 *) &TK[0])) >> 1);
+	WEPSeed[3] = Lo8((PPK[5] ^ Mk16_le((__le16 *)&TK[0])) >> 1);
 
 #ifdef __BIG_ENDIAN
 	{
-- 
1.9.1