From: David Laight <David.Laight@ACULAB.COM>
To: 'Jhih-Ming Huang' <fbihjmeric@gmail.com>,
"gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
"fabioaiuto83@gmail.com" <fabioaiuto83@gmail.com>,
"ross.schm.dev@gmail.com" <ross.schm.dev@gmail.com>,
"maqianga@uniontech.com" <maqianga@uniontech.com>,
"marcocesati@gmail.com" <marcocesati@gmail.com>,
"linux-staging@lists.linux.dev" <linux-staging@lists.linux.dev>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH v5] rtw_security: fix cast to restricted __le32
Date: Tue, 22 Jun 2021 09:31:54 +0000 [thread overview]
Message-ID: <bdc0c31a7d28426995d229eb9014cd2b@AcuMS.aculab.com> (raw)
In-Reply-To: <20210621081928.145203-1-fbihjmeric@gmail.com>
From: Jhih-Ming Huang
> Sent: 21 June 2021 09:19
>
> This patch fixes the sparse warning of fix cast to restricted __le32.
>
> There was a change for replacing private CRC-32 routines with in kernel
> ones.
> However, the author used le32_to_cpu to convert crc32_le(), and we
> should cpu_to_le32.
>
> Ths commit also fixes the payload checking by memcmp instead of checking element
> by element and removes the unused variable.
...
> diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c
> b/drivers/staging/rtl8723bs/core/rtw_security.c
> index a99f439328f1..8dc6a976b487 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_security.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_security.c
...
> @@ -537,7 +532,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
> u32 pnh;
> u8 rc4key[16];
> u8 ttkey[16];
> - u8 crc[4];
> + __le32 crc;
> signed int length;
>
> u8 *pframe, *payload, *iv, *prwskey;
> @@ -618,10 +613,9 @@ 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));
> + crc = cpu_to_le32(~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])
> + if (memcmp(&crc, payload + length - 4, 4) != 0)
Shouldn't this be using (IIRC) get_unaligned_le32() ?
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)
next prev parent reply other threads:[~2021-06-22 9:31 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-13 12:28 [PATCH v2] rtw_security: fix cast to restricted __le32 Jhih-Ming Huang
2021-06-13 12:34 ` Greg KH
2021-06-13 16:40 ` Jhih Ming Huang
2021-06-14 14:14 ` Al Viro
2021-06-14 15:27 ` Jhih Ming Huang
2021-06-14 17:03 ` Al Viro
2021-06-18 18:17 ` [PATCH v3] " Jhih-Ming Huang
2021-06-18 19:29 ` Al Viro
2021-06-19 7:52 ` [PATCH v4] " Jhih-Ming Huang
2021-06-21 8:19 ` [PATCH v5] " Jhih-Ming Huang
2021-06-21 15:48 ` [PATCH v6] " Jhih-Ming Huang
2021-06-21 15:51 ` [PATCH v5] " Jhih-Ming Huang
2021-06-22 9:31 ` David Laight [this message]
2021-07-04 10:31 ` [PATCH v7] " Jhih-Ming Huang
2021-07-04 19:05 ` Greg KH
2021-08-01 15:51 ` Jhih-Ming Huang
2021-08-05 11:17 ` Greg KH
2021-06-19 9:20 ` [PATCH v3] " Jhih-Ming Huang
2021-06-18 18:28 ` [PATCH v2] " Jhih Ming Huang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bdc0c31a7d28426995d229eb9014cd2b@AcuMS.aculab.com \
--to=david.laight@aculab.com \
--cc=fabioaiuto83@gmail.com \
--cc=fbihjmeric@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=maqianga@uniontech.com \
--cc=marcocesati@gmail.com \
--cc=ross.schm.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).