]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
mac80211: properly handle A-MSDUs that start with an RFC 1042 header
authorMathy Vanhoef <Mathy.Vanhoef@kuleuven.be>
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)
commit3a1d65d9168f4c82536d7704c7a4032a455b79d5
tree7d54dd83875f6b77370a2800d4859b52e3252e23
parent53077cfc2793581bb50a8b36f4a8990a18e8322f
mac80211: properly handle A-MSDUs that start with an RFC 1042 header

Properly parse A-MSDUs whose first 6 bytes happen to equal a rfc1042
header. This can occur in practice when the destination MAC address
equals AA:AA:03:00:00:00. More importantly, this simplifies the next
patch to mitigate A-MSDU injection attacks.

Cc: stable@vger.kernel.org
Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@kuleuven.be>
Link: https://lore.kernel.org/r/20210511200110.0b2b886492f0.I23dd5d685fe16d3b0ec8106e8f01b59f499dffed@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
(cherry picked from commit a1d5ff5651ea592c67054233b14b30bf4452999c)
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>
include/net/cfg80211.h
net/mac80211/rx.c
net/wireless/util.c