[PATCH 0/2] staging: rtl8732bs: Fix sparse warnings

[PATCH 0/2] staging: rtl8732bs: Fix sparse warnings

[Aakash Hemadri]

This patchset fixes the below sparse warnings

rtw_security.c:72:50: warning: incorrect type in assignment (different base types)
rtw_security.c:72:50:    expected restricted __le32 [usertype]
rtw_security.c:72:50:    got unsigned int
rtw_security.c:80:50: warning: incorrect type in assignment (different base types)
rtw_security.c:80:50:    expected restricted __le32 [usertype]
rtw_security.c:80:50:    got unsigned int
rtw_security.c:124:33: warning: cast to restricted __le32
rtw_security.c:509:58: warning: incorrect type in assignment (different base types)
rtw_security.c:509:58:    expected restricted __le32 [usertype]
rtw_security.c:509:58:    got unsigned int
rtw_security.c:517:58: warning: incorrect type in assignment (different base types)
rtw_security.c:517:58:    expected restricted __le32 [usertype]
rtw_security.c:517:58:    got unsigned int
rtw_security.c:621:41: warning: cast to restricted __le32

This can be applied cleanly on next-20210816, and is compile tested.

Aakash Hemadri (2):
  staging: rtl8732bs: incorrect type in assignment
  staging: rtl8723bs: cast to restricted __le32

 rtw_security.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

-- 
2.32.0

[PATCH 1/2] staging: rtl8732bs: incorrect type in assignment

[Aakash Hemadri]

Cast u32 to __le32 with __cpu_to_le32 to fix sparse warning:

warning: incorrect type in assignment (different base types)
expected restricted __le32 [usertype]
got unsigned int

Signed-off-by: Aakash Hemadri <aakashhemadri123@gmail.com>
---
 drivers/staging/rtl8723bs/core/rtw_security.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c
index a99f439328f1..381deeea99d0 100644
--- a/drivers/staging/rtl8723bs/core/rtw_security.c
+++ b/drivers/staging/rtl8723bs/core/rtw_security.c
@@ -8,6 +8,7 @@
 #include <drv_types.h>
 #include <rtw_debug.h>
 #include <crypto/aes.h>
+#include <linux/byteorder/little_endian.h>
 
 static const char * const _security_type_str[] = {
 	"N/A",
@@ -69,7 +70,7 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)
 
 				length = pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;
 
-				*((__le32 *)crc) = ~crc32_le(~0, payload, length);
+				*((__le32 *)crc) = __cpu_to_le32(~crc32_le(~0, payload, length));
 
 				arc4_setkey(ctx, wepkey, 3 + keylength);
 				arc4_crypt(ctx, payload, payload, length);
@@ -77,7 +78,7 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)
 
 			} else {
 				length = pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;
-				*((__le32 *)crc) = ~crc32_le(~0, payload, length);
+				*((__le32 *)crc) = __cpu_to_le32(~crc32_le(~0, payload, length));
 				arc4_setkey(ctx, wepkey, 3 + keylength);
 				arc4_crypt(ctx, payload, payload, length);
 				arc4_crypt(ctx, payload + length, crc, 4);
@@ -506,7 +507,8 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
 
 				if ((curfragnum+1) == pattrib->nr_frags) {	/* 4 the last fragment */
 					length = pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;
-					*((__le32 *)crc) = ~crc32_le(~0, payload, length);
+					*((__le32 *)crc) =
+						__cpu_to_le32(~crc32_le(~0, payload, length));
 
 					arc4_setkey(ctx, rc4key, 16);
 					arc4_crypt(ctx, payload, payload, length);
@@ -514,7 +516,8 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
 
 				} else {
 					length = pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;
-					*((__le32 *)crc) = ~crc32_le(~0, payload, length);
+					*((__le32 *)crc) =
+						__cpu_to_le32(~crc32_le(~0, payload, length));
 
 					arc4_setkey(ctx, rc4key, 16);
 					arc4_crypt(ctx, payload, payload, length);
-- 
2.32.0

[PATCH 2/2] staging: rtl8723bs: fix cast to restricted __le32

[Aakash Hemadri]

Fix sparse warning:
warning: cast to restricted __le32

Signed-off-by: Aakash Hemadri <aakashhemadri123@gmail.com>
---
 drivers/staging/rtl8723bs/core/rtw_security.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c
index 381deeea99d0..5320b1a46dfb 100644
--- a/drivers/staging/rtl8723bs/core/rtw_security.c
+++ b/drivers/staging/rtl8723bs/core/rtw_security.c
@@ -122,7 +122,7 @@ void rtw_wep_decrypt(struct adapter  *padapter, u8 *precvframe)
 		arc4_crypt(ctx, payload, payload,  length);
 
 		/* calculate icv and compare the icv */
-		*((u32 *)crc) = le32_to_cpu(~crc32_le(~0, payload, length - 4));
+		*((u32 *)crc) = ~crc32_le(~0, payload, length - 4);
 
 	}
 }
@@ -621,7 +621,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
 			arc4_setkey(ctx, rc4key, 16);
 			arc4_crypt(ctx, payload, payload, length);
 
-			*((u32 *)crc) = le32_to_cpu(~crc32_le(~0, payload, length - 4));
+			*((u32 *)crc) = ~crc32_le(~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])
-- 
2.32.0

Re: [PATCH 0/2] staging: rtl8732bs: Fix sparse warnings

[Greg Kroah-Hartman]

On Mon, Aug 16, 2021 at 11:00:41PM +0530, Aakash Hemadri wrote:
> This patchset fixes the below sparse warnings
> 
> rtw_security.c:72:50: warning: incorrect type in assignment (different base types)
> rtw_security.c:72:50:    expected restricted __le32 [usertype]
> rtw_security.c:72:50:    got unsigned int
> rtw_security.c:80:50: warning: incorrect type in assignment (different base types)
> rtw_security.c:80:50:    expected restricted __le32 [usertype]
> rtw_security.c:80:50:    got unsigned int
> rtw_security.c:124:33: warning: cast to restricted __le32
> rtw_security.c:509:58: warning: incorrect type in assignment (different base types)
> rtw_security.c:509:58:    expected restricted __le32 [usertype]
> rtw_security.c:509:58:    got unsigned int
> rtw_security.c:517:58: warning: incorrect type in assignment (different base types)
> rtw_security.c:517:58:    expected restricted __le32 [usertype]
> rtw_security.c:517:58:    got unsigned int
> rtw_security.c:621:41: warning: cast to restricted __le32
> 
> This can be applied cleanly on next-20210816, and is compile tested.
> 
> Aakash Hemadri (2):
>   staging: rtl8732bs: incorrect type in assignment
>   staging: rtl8723bs: cast to restricted __le32
> 
>  rtw_security.c | 15 +++++++++------
>  1 file changed, 9 insertions(+), 6 deletions(-)

This series does not apply to my tree at all.  Please fix up and rebase
and resubmit, after reading the mailing list archives for others that
have attempted do do this type of work in the past for this issue.

It is not a trivial change that is needed...

thanks,

greg k-h

Re: [PATCH 0/2] staging: rtl8732bs: Fix sparse warnings

[Fabio M. De Francesco]

On Tuesday, August 17, 2021 7:54:11 PM CEST Greg Kroah-Hartman wrote:
> On Mon, Aug 16, 2021 at 11:00:41PM +0530, Aakash Hemadri wrote:
> > This patchset fixes the below sparse warnings
> > 
> > rtw_security.c:72:50: warning: incorrect type in assignment (different base types)
> > rtw_security.c:72:50:    expected restricted __le32 [usertype]
> > rtw_security.c:72:50:    got unsigned int
> >
> > [...]
> 
> This series does not apply to my tree at all.  Please fix up and rebase
> and resubmit, after reading the mailing list archives for others that
> have attempted do do this type of work in the past for this issue.
> 
> It is not a trivial change that is needed...

Dear Greg,

As I've already pointed out in another message of this thread, your tree has 
already these sparse warnings fixed by me with commit aef1c966a364 (that 
you applied with a "much nicer!" comment).

So, when Aakash rebases against your current tree, he will not anymore see
those sparse warnings.

Thanks,

Fabio


> 
> thanks,
> 
> greg k-h
> 

Re: [PATCH 0/2] staging: rtl8732bs: Fix sparse warnings

[Aakash Hemadri]

On 21/08/17 07:54PM, Greg Kroah-Hartman wrote:
> This series does not apply to my tree at all.  Please fix up and rebase
> and resubmit, after reading the mailing list archives for others that
> have attempted do do this type of work in the past for this issue.
> 
> It is not a trivial change that is needed...

Will check what went wrong, and see what I can do.

Thanks,
Aakash Hemadri

Re: [PATCH 0/2] staging: rtl8732bs: Fix sparse warnings

[Aakash Hemadri]

On 21/08/17 09:10PM, Fabio M. De Francesco wrote:
> On Tuesday, August 17, 2021 7:54:11 PM CEST Greg Kroah-Hartman wrote:
> > On Mon, Aug 16, 2021 at 11:00:41PM +0530, Aakash Hemadri wrote:
> > > This patchset fixes the below sparse warnings
> > > 
> > > rtw_security.c:72:50: warning: incorrect type in assignment (different base types)
> > > rtw_security.c:72:50:    expected restricted __le32 [usertype]
> > > rtw_security.c:72:50:    got unsigned int
> > >
> > > [...]
> > 
> > This series does not apply to my tree at all.  Please fix up and rebase
> > and resubmit, after reading the mailing list archives for others that
> > have attempted do do this type of work in the past for this issue.
> > 
> > It is not a trivial change that is needed...
> 
> Dear Greg,
> 
> As I've already pointed out in another message of this thread, your tree has 
> already these sparse warnings fixed by me with commit aef1c966a364 (that 
> you applied with a "much nicer!" comment).
> 
> So, when Aakash rebases against your current tree, he will not anymore see
> those sparse warnings.

Thanks for the patch Fabio! Will rebase and work on something new!

Thanks,
Aakash Hemadri

Re: [PATCH 0/2] staging: rtl8732bs: Fix sparse warnings

[Fabio M. De Francesco]

On Monday, August 16, 2021 8:48:48 PM CEST Fabio M. De Francesco wrote:
> On Monday, August 16, 2021 7:35:05 PM CEST Aakash Hemadri wrote:
> > This patchset fixes the below sparse warnings
> >
> > [...]
> >
> This warnings have been fixed time ago against staging-testing:
> please see commit aef1c966a364.

Hi Aakash,

I see at least two of your messages never made it to
linux-staging list because the address is incorrect (you did not write in CC
linux-staging@lists.linux.dev, instead you used the nonexistent
linux-staging@vger.kernel.org):

https://lore.kernel.org/lkml/20210818044200.tvpr4j5vcaimexsn@xps.yggdrasil/
https://lore.kernel.org/lkml/20210818044049.yd7tnjvj3j4j3ddb@xps.yggdrasil/

Please, send them again to the correct address.

Thanks,

Fabio

Re: [PATCH 0/2] staging: rtl8732bs: Fix sparse warnings

[Fabio M. De Francesco]

On Monday, August 16, 2021 7:35:05 PM CEST Aakash Hemadri wrote:
> This patchset fixes the below sparse warnings
> 
> rtw_security.c:72:50: warning: incorrect type in assignment (different base 
types)
> rtw_security.c:72:50:    expected restricted __le32 [usertype]
> rtw_security.c:72:50:    got unsigned int
>
> [...]
> 
> This can be applied cleanly on next-20210816, and is compile tested.

This warnings have been fixed time ago against staging-testing:
please see commit aef1c966a364.

Thanks,

Fabio

> Please ignore the duplicate of this patchset, I did not CC staging.
> Message ID: <cover.1629134725.git.aakashhemadri123@gmail.com>
> 
> Aakash Hemadri (2):
>   staging: rtl8732bs: incorrect type in assignment
>   staging: rtl8723bs: cast to restricted __le32
> 
>  drivers/staging/rtl8723bs/core/rtw_security.c | 15 +++++++++------
>  1 file changed, 9 insertions(+), 6 deletions(-)

[PATCH 0/2] staging: rtl8732bs: Fix sparse warnings

[Aakash Hemadri]

This patchset fixes the below sparse warnings

rtw_security.c:72:50: warning: incorrect type in assignment (different base types)
rtw_security.c:72:50:    expected restricted __le32 [usertype]
rtw_security.c:72:50:    got unsigned int
rtw_security.c:80:50: warning: incorrect type in assignment (different base types)
rtw_security.c:80:50:    expected restricted __le32 [usertype]
rtw_security.c:80:50:    got unsigned int
rtw_security.c:124:33: warning: cast to restricted __le32
rtw_security.c:509:58: warning: incorrect type in assignment (different base types)
rtw_security.c:509:58:    expected restricted __le32 [usertype]
rtw_security.c:509:58:    got unsigned int
rtw_security.c:517:58: warning: incorrect type in assignment (different base types)
rtw_security.c:517:58:    expected restricted __le32 [usertype]
rtw_security.c:517:58:    got unsigned int
rtw_security.c:621:41: warning: cast to restricted __le32

This can be applied cleanly on next-20210816, and is compile tested.

Please ignore the duplicate of this patchset, I did not CC staging.
Message ID: <cover.1629134725.git.aakashhemadri123@gmail.com>

Aakash Hemadri (2):
  staging: rtl8732bs: incorrect type in assignment
  staging: rtl8723bs: cast to restricted __le32

 drivers/staging/rtl8723bs/core/rtw_security.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

-- 
2.32.0