summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorHector Martin <marcan@marcan.st>2023-03-11 17:19:14 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-03-13 12:19:36 +0300
commitdecf73066f7eae34e434f707698c2c8b3bc62902 (patch)
tree7cae32c8fd1b09e6016f3cf8a5f9197ea682b5dc /net
parente5f315b55f8e09ac17c968da42f9345f64efcdd2 (diff)
downloadlinux-decf73066f7eae34e434f707698c2c8b3bc62902.tar.xz
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>
Diffstat (limited to 'net')
-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 f4d98ed8fa31..f7e2e172a68d 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -1264,8 +1264,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;