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

Commit a8b8b535 authored by Dinghao Liu's avatar Dinghao Liu Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8188eu: rtw_mlme: Fix uninitialized variable authmode 



commit 11536442a3b4e1de6890ea5e805908debb74f94a upstream.

The variable authmode can be uninitialized. The danger would be if
it equals to _WPA_IE_ID_ (0xdd) or _WPA2_IE_ID_ (0x33). We can avoid
this by setting it to zero instead. This is the approach that was
used in the rtl8723bs driver.

Fixes: 7b464c9f ("staging: r8188eu: Add files for new driver - part 4")
Co-developed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200728072153.9202-1-dinghao.liu@zju.edu.cn


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af707d9d

drivers/staging/rtl8188eu/core/rtw_mlme.c

+3 −1
Original line number Diff line number Diff line
@@ -1729,9 +1729,11 @@ int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_ 
	if ((ndisauthmode == Ndis802_11AuthModeWPA) ||

	    (ndisauthmode == Ndis802_11AuthModeWPAPSK))

		authmode = _WPA_IE_ID_;

	if ((ndisauthmode == Ndis802_11AuthModeWPA2) ||

	else if ((ndisauthmode == Ndis802_11AuthModeWPA2) ||

	    (ndisauthmode == Ndis802_11AuthModeWPA2PSK))

		authmode = _WPA2_IE_ID_;

	else

		authmode = 0x0;



	if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) {

		memcpy(out_ie+ielength, psecuritypriv->wps_ie, psecuritypriv->wps_ie_len);