2021-08-28 04:30:51

by Aakash Hemadri

Subject: [PATCH] staging: wlan-ng: fix invalid assignment warning

p80211_hdr->frame_control is u16, change to __le16
to satisfy sparse warning:

wlan-ng/prism2sta.c:253:43: warning: invalid assignment: |=
wlan-ng/prism2sta.c:253:43: left side has type unsigned short
wlan-ng/prism2sta.c:253:43: right side has type restricted __le16

Signed-off-by: Aakash Hemadri <[email protected]>
---
drivers/staging/wlan-ng/p80211hdr.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/wlan-ng/p80211hdr.h b/drivers/staging/wlan-ng/p80211hdr.h
index dd1fb99bf340..5871a55e4a61 100644
--- a/drivers/staging/wlan-ng/p80211hdr.h
+++ b/drivers/staging/wlan-ng/p80211hdr.h
@@ -149,7 +149,7 @@
/* Generic 802.11 Header types */

struct p80211_hdr {
- u16 frame_control;
+ __le16 frame_control;
u16 duration_id;
u8 address1[ETH_ALEN];
u8 address2[ETH_ALEN];

base-commit: f6bc526accf861728d36b12fbc25ac94cd057fc9
--
2.32.0

2021-08-28 06:01:52

by Kees Cook

Subject: Re: [PATCH] staging: wlan-ng: fix invalid assignment warning

On Sat, Aug 28, 2021 at 09:59:49AM +0530, Aakash Hemadri wrote:
> p80211_hdr->frame_control is u16, change to __le16
> to satisfy sparse warning:
>
> wlan-ng/prism2sta.c:253:43: warning: invalid assignment: |=
> wlan-ng/prism2sta.c:253:43: left side has type unsigned short
> wlan-ng/prism2sta.c:253:43: right side has type restricted __le16
>
> Signed-off-by: Aakash Hemadri <[email protected]>

Whoops; thanks for catching that.

Fixes: 6277fbfdd29c ("staging: wlan-ng: Remove pointless a3/a4 union")
Reviewed-by: Kees Cook <[email protected]>

-Kees

> ---
> drivers/staging/wlan-ng/p80211hdr.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/wlan-ng/p80211hdr.h b/drivers/staging/wlan-ng/p80211hdr.h
> index dd1fb99bf340..5871a55e4a61 100644
> --- a/drivers/staging/wlan-ng/p80211hdr.h
> +++ b/drivers/staging/wlan-ng/p80211hdr.h
> @@ -149,7 +149,7 @@
> /* Generic 802.11 Header types */
>
> struct p80211_hdr {
> - u16 frame_control;
> + __le16 frame_control;
> u16 duration_id;
> u8 address1[ETH_ALEN];
> u8 address2[ETH_ALEN];
>
> base-commit: f6bc526accf861728d36b12fbc25ac94cd057fc9
> --
> 2.32.0
>

--
Kees Cook