wifi: cfg80211: Partial revert "wifi: cfg80211: Fix use after free for wext"

marcan · torvalds · commit 79d1ed5ca7db · 2023-03-12T16:21:59.000-07:00
This reverts part of commit 015b8cc ("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: 015b8cc ("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>
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
@@ -1500,8 +1500,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;

Original file line number	Diff line number	Diff line change
`@@ -1500,8 +1500,6 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev,`
`1500`	`1500`	`connect->key = NULL;`
`1501`	`1501`	`connect->key_len = 0;`
`1502`	`1502`	`connect->key_idx = 0;`
`1503`		`- connect->crypto.cipher_group = 0;`
`1504`		`- connect->crypto.n_ciphers_pairwise = 0;`
`1505`	`1503`	`}`
`1506`	`1504`
`1507`	`1505`	`wdev->connect_keys = connkeys;`