| Message ID | 20230311141914.24444-1-marcan@marcan.st (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | wifi: cfg80211: Partial revert "wifi: cfg80211: Fix use after free for wext" | expand |
On 2023-03-11 23:19:14 +0900, Hector Martin wrote: > 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. > > Fixes: 015b8cc5e7c4 ("wifi: cfg80211: Fix use after free for wext") > Cc: stable@vger.kernel.org > Link: https://lore.kernel.org/linux-wireless/ZAx0TWRBlGfv7pNl@kroah.com/T/#m11e6e0915ab8fa19ce8bc9695ab288c0fe018edf > Signed-off-by: Hector Martin <marcan@marcan.st> > --- > net/wireless/sme.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/net/wireless/sme.c b/net/wireless/sme.c > index 28ce13840a88..7bdeb8eea92d 100644 > --- 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; Tested-by: Janne Grunau <j@jannau.net> thanks, Janne
On Sat, 11 Mar 2023 at 14:28, Hector Martin <marcan@marcan.st> wrote: > > 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. > > Fixes: 015b8cc5e7c4 ("wifi: cfg80211: Fix use after free for wext") > Cc: stable@vger.kernel.org > Link: https://lore.kernel.org/linux-wireless/ZAx0TWRBlGfv7pNl@kroah.com/T/#m11e6e0915ab8fa19ce8bc9695ab288c0fe018edf > Signed-off-by: Hector Martin <marcan@marcan.st> Reviewed-by: Eric Curtin <ecurtin@redhat.com> Is mise le meas/Regards, Eric Curtin > --- > net/wireless/sme.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/net/wireless/sme.c b/net/wireless/sme.c > index 28ce13840a88..7bdeb8eea92d 100644 > --- 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; > -- > 2.35.1 > >
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index 28ce13840a88..7bdeb8eea92d 100644 --- 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;
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. Fixes: 015b8cc5e7c4 ("wifi: cfg80211: Fix use after free for wext") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/linux-wireless/ZAx0TWRBlGfv7pNl@kroah.com/T/#m11e6e0915ab8fa19ce8bc9695ab288c0fe018edf Signed-off-by: Hector Martin <marcan@marcan.st> --- net/wireless/sme.c | 2 -- 1 file changed, 2 deletions(-) -- 2.35.1