Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce588054 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: Fix module loading from tasklet for CCMP encryption 



commit 84cad97a717f5749a0236abd5ce68da582ea074f upstream.

Commit 6bd082af ("staging:r8188eu: use lib80211 CCMP decrypt")
causes scheduling while atomic bugs followed by a hard freeze whenever
the driver tries to connect to a CCMP-encrypted network. Experimentation
showed that the freezes were eliminated when module lib80211 was
preloaded, which can be forced by calling lib80211_get_crypto_ops()
directly rather than indirectly through try_then_request_module().
With this change, no BUG messages are logged.

Fixes: 6bd082af ("staging:r8188eu: use lib80211 CCMP decrypt")
Cc: Stable <stable@vger.kernel.org> # v4.17+
Reported-and-tested-by: default avatarMichael Straube <straube.linux@gmail.com>
Cc: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d7068618

drivers/staging/rtl8188eu/core/rtw_security.c

+1 −1
Original line number Diff line number Diff line
@@ -1292,7 +1292,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe) 
			struct sk_buff *skb = ((struct recv_frame *)precvframe)->pkt;

			void *crypto_private = NULL;

			u8 *key, *pframe = skb->data;

			struct lib80211_crypto_ops *crypto_ops = try_then_request_module(lib80211_get_crypto_ops("CCMP"), "lib80211_crypt_ccmp");

			struct lib80211_crypto_ops *crypto_ops = lib80211_get_crypto_ops("CCMP");

			struct security_priv *psecuritypriv = &padapter->securitypriv;

			char iv[8], icv[8];