summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHector Martin <marcan@marcan.st>2023-03-11 23:19:14 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-03-13 10:26:43 +0100
commit4a48cd80957e796844d3868b2a417cf79bcd134c (patch)
tree4b189b8e63db5a274e1f07f6b4711ee197758a7f
parenttpm: disable hwrng for fTPM on some AMD designs (diff)
downloadlinux-stable-4a48cd80957e796844d3868b2a417cf79bcd134c.tar.xz
linux-stable-4a48cd80957e796844d3868b2a417cf79bcd134c.zip
wifi: cfg80211: Partial revert "wifi: cfg80211: Fix use after free for wext"
commit 79d1ed5ca7db67d48e870c979f0e0f6b0947944a upstream. This reverts part of commit 015b8cc5e7c4 ("wifi: cfg80211: Fix use after free for wext") This commit broke WPA offload by unconditionally clearing the crypto modes for non-WEP connections. Drop that part of the patch. Signed-off-by: Hector Martin <marcan@marcan.st> Reported-by: Ilya <me@0upti.me> Reported-and-tested-by: Janne Grunau <j@jannau.net> Reviewed-by: Eric Curtin <ecurtin@redhat.com> Fixes: 015b8cc5e7c4 ("wifi: cfg80211: Fix use after free for wext") Cc: stable@kernel.org Link: https://lore.kernel.org/linux-wireless/ZAx0TWRBlGfv7pNl@kroah.com/T/#m11e6e0915ab8fa19ce8bc9695ab288c0fe018edf Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/wireless/sme.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 4f813e346a8b..ce1ac01705f9 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -1504,8 +1504,6 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev,
connect->key = NULL;
connect->key_len = 0;
connect->key_idx = 0;
- connect->crypto.cipher_group = 0;
- connect->crypto.n_ciphers_pairwise = 0;
}
wdev->connect_keys = connkeys;