]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
mac80211: drop A-MSDUs on old ciphers
authorJohannes Berg <johannes.berg@intel.com>
Tue, 25 May 2021 17:46:00 +0000 (19:46 +0200)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Fri, 28 May 2021 10:39:09 +0000 (12:39 +0200)
commitb89d46d88177285e6849a5f5b62b1ed70d7bf59b
tree04edd54f6ae2de60c9fd013f57a55e035e2b124c
parentbdfedb781d5ee36ae04bbde410924ee936ff0965
mac80211: drop A-MSDUs on old ciphers

With old ciphers (WEP and TKIP) we shouldn't be using A-MSDUs
since A-MSDUs are only supported if we know that they are, and
the only practical way for that is HT support which doesn't
support old ciphers.

However, we would normally accept them anyway. Since we check
the MMIC before deaggregating A-MSDUs, and the A-MSDU bit in
the QoS header is not protected in TKIP (or WEP), this enables
attacks similar to CVE-2020-24588. To prevent that, drop A-MSDUs
completely with old ciphers.

Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210511200110.076543300172.I548e6e71f1ee9cad4b9a37bf212ae7db723587aa@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
(cherry picked from commit 270032a2a9c4535799736142e1e7c413ca7b836e)
CVE-2020-24588
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
net/mac80211/rx.c