[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <3181a89b49e571883525172a7773b12f046e8b09.camel@sipsolutions.net>
Date: Sun, 19 Feb 2023 16:12:05 +0100
From: Johannes Berg <johannes@...solutions.net>
To: Kees Cook <keescook@...omium.org>,
Gregory Greenman <gregory.greenman@...el.com>
Cc: Kalle Valo <kvalo@...nel.org>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Benjamin Berg <benjamin.berg@...el.com>,
Sriram R <quic_srirrama@...cinc.com>,
linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-hardening@...r.kernel.org
Subject: Re: [PATCH] wifi: iwlwifi: dvm: Add struct_group for struct
iwl_keyinfo keys
On Sat, 2023-02-18 at 11:11 -0800, Kees Cook wrote:
>
> case WLAN_CIPHER_SUITE_CCMP:
> key_flags |= STA_KEY_FLG_CCMP;
> - memcpy(sta_cmd.key.key, keyconf->key, keyconf->keylen);
> + memcpy(&sta_cmd.key.keys, keyconf->key, keyconf->keylen);
This should be fine though, only up to 16 bytes for CCMP.
> case WLAN_CIPHER_SUITE_TKIP:
> key_flags |= STA_KEY_FLG_TKIP;
> sta_cmd.key.tkip_rx_tsc_byte2 = tkip_iv32;
> for (i = 0; i < 5; i++)
> sta_cmd.key.tkip_rx_ttak[i] = cpu_to_le16(tkip_p1k[i]);
> - memcpy(sta_cmd.key.key, keyconf->key, keyconf->keylen);
> + memcpy(&sta_cmd.key.keys, keyconf->key, keyconf->keylen);
And that's actually a bug, we should've copied only 16 bytes, I guess.
DVM didn't support MIC offload anyway (at least the way Linux uses the
firmware, though I thought it doesn't at all), so we don't need the MIC
RX/TX keys in there, but anyway the sequence counter values are not part
of the key material on the host.
I don't think I have a machine now to test this with (nor a TKIP AP, of
course, but that could be changed) - but I suspect that since we
actually calculate the TTAK above, we might not even need this memcpy()
at all?
johannes
Powered by blists - more mailing lists