Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1633572 > unrolled thread
| Started by | suniel.spartan@gmail.com |
|---|---|
| First post | 2017-05-01 10:00 +0200 |
| Last post | 2017-05-12 18:00 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] staging: rtl8192u: Fix type mismatch warnings reported by sparse suniel.spartan@gmail.com - 2017-05-01 10:00 +0200
Re: [PATCH] staging: rtl8192u: Fix type mismatch warnings reported by sparse Greg KH <gregkh@linuxfoundation.org> - 2017-05-12 11:10 +0200
[PATCH v2] staging: rtl8192u: Fix type mismatch warnings reported by sparse suniel.spartan@gmail.com - 2017-05-12 18:00 +0200
| From | suniel.spartan@gmail.com |
|---|---|
| Date | 2017-05-01 10:00 +0200 |
| Subject | [PATCH] staging: rtl8192u: Fix type mismatch warnings reported by sparse |
| Message-ID | <tCeps-6id-5@gated-at.bofh.it> |
From: Suniel Mahesh <suniel.spartan@gmail.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@gmail.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
[toc] | [next] | [standalone]
| From | Greg KH <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2017-05-12 11:10 +0200 |
| Subject | Re: [PATCH] staging: rtl8192u: Fix type mismatch warnings reported by sparse |
| Message-ID | <tGeKe-2eI-21@gated-at.bofh.it> |
| In reply to | #1633572 |
On Mon, May 01, 2017 at 01:19:24PM +0530, suniel.spartan@gmail.com wrote:
> From: Suniel Mahesh <suniel.spartan@gmail.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@gmail.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);
> }
Ick, no, just replace all usages of this function with the "real"
le16_to_cpu() call.
thanks,
greg k-h
[toc] | [prev] | [next] | [standalone]
| From | suniel.spartan@gmail.com |
|---|---|
| Date | 2017-05-12 18:00 +0200 |
| Subject | [PATCH v2] staging: rtl8192u: Fix type mismatch warnings reported by sparse |
| Message-ID | <tGl90-6Ig-17@gated-at.bofh.it> |
| In reply to | #1640332 |
From: Suniel Mahesh <suniel.spartan@gmail.com>
Mk16_le() is an inline function returning le16_to_cpu()
which is causing type mismatch warnings. Removed Mk16_le() and
replaced it with le16_to_cpu() with appropriate argument type as
suggested by Greg K-H.
Signed-off-by: Suniel Mahesh <suniel.spartan@gmail.com>
---
Changes for v2:
- Modified commit message, removed Mk16_le() and replaced it with
le16_to_cpu() as suggested by Greg K-H.
- Patches were tested and built on linux-next and staging-testing
---
.../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 27 ++++++++--------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
index 5039172..60ecfec 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
@@ -171,13 +171,6 @@ static inline u16 Mk16(u8 hi, u8 lo)
return lo | (((u16) hi) << 8);
}
-
-static inline u16 Mk16_le(u16 *v)
-{
- return le16_to_cpu(*v);
-}
-
-
static const u16 Sbox[256] = {
0xC6A5, 0xF884, 0xEE99, 0xF68D, 0xFF0D, 0xD6BD, 0xDEB1, 0x9154,
0x6050, 0x0203, 0xCEA9, 0x567D, 0xE719, 0xB562, 0x4DE6, 0xEC9A,
@@ -264,15 +257,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] ^ le16_to_cpu(*(__le16 *)(&TK[0])));
+ PPK[1] += _S_(PPK[0] ^ le16_to_cpu(*(__le16 *)(&TK[2])));
+ PPK[2] += _S_(PPK[1] ^ le16_to_cpu(*(__le16 *)(&TK[4])));
+ PPK[3] += _S_(PPK[2] ^ le16_to_cpu(*(__le16 *)(&TK[6])));
+ PPK[4] += _S_(PPK[3] ^ le16_to_cpu(*(__le16 *)(&TK[8])));
+ PPK[5] += _S_(PPK[4] ^ le16_to_cpu(*(__le16 *)(&TK[10])));
+
+ PPK[0] += RotR1(PPK[5] ^ le16_to_cpu(*(__le16 *)(&TK[12])));
+ PPK[1] += RotR1(PPK[0] ^ le16_to_cpu(*(__le16 *)(&TK[14])));
PPK[2] += RotR1(PPK[1]);
PPK[3] += RotR1(PPK[2]);
PPK[4] += RotR1(PPK[3]);
@@ -285,7 +278,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] ^ le16_to_cpu(*(__le16 *)(&TK[0]))) >> 1);
#ifdef __BIG_ENDIAN
{
--
1.9.1
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web