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

Commit 5345ea6a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Kalle Valo
Browse files

rtlwifi: fix error handling in *_read_adapter_info() 



There are nine copies of the _rtl88ee_read_adapter_info() function,
and most but not all of them cause a build warning in some configurations:

rtl8192de/hw.c: In function '_rtl92de_read_adapter_info':
rtl8192de/hw.c:1767:12: error: 'hwinfo' may be used uninitialized in this function [-Werror=maybe-uninitialized]
rtl8723ae/hw.c: In function '_rtl8723e_read_adapter_info.constprop':
rtlwifi/rtl8723ae/hw.c:1654:12: error: 'hwinfo' may be used uninitialized in this function [-Werror=maybe-uninitialized]

The problem is that when rtlefuse->epromtype is something other than
EEPROM_BOOT_EFUSE, the rest of the function uses undefined data, resulting
in random behavior later.

Apparently, in some drivers, the problem was already found and fixed
but the fix did not make it into the others.

This picks one approach to deal with the problem and applies identical
code to all 9 files, to simplify the later consolidation of those.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent fd3667a8

drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c

+7 −5
Original line number Diff line number Diff line
@@ -1839,20 +1839,22 @@ static void _rtl88ee_read_adapter_info(struct ieee80211_hw *hw) 
	u8 hwinfo[HWSET_MAX_SIZE];

	u16 eeprom_id;



	if (rtlefuse->epromtype == EEPROM_BOOT_EFUSE) {

	switch (rtlefuse->epromtype) {

	case EEPROM_BOOT_EFUSE:

		rtl_efuse_shadow_map_update(hw);

		break;



		memcpy(hwinfo, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0],

		       HWSET_MAX_SIZE);

	} else if (rtlefuse->epromtype == EEPROM_93C46) {

	case EEPROM_93C46:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "RTL819X Not boot from eeprom, check it !!");

		return;

	} else {



	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "boot from neither eeprom nor efuse, check it !!");

		return;

	}

	memcpy(hwinfo, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0], HWSET_MAX_SIZE);



	RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP\n",

		      hwinfo, HWSET_MAX_SIZE);

drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c

+12 −5
Original line number Diff line number Diff line
@@ -1680,21 +1680,28 @@ static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));

	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));

	struct device *dev = &rtl_pcipriv(hw)->dev.pdev->dev;

	u16 i, usvalue;

	u8 hwinfo[HWSET_MAX_SIZE];

	u16 eeprom_id;



	if (rtlefuse->epromtype == EEPROM_BOOT_EFUSE) {

	switch (rtlefuse->epromtype) {

	case EEPROM_BOOT_EFUSE:

		rtl_efuse_shadow_map_update(hw);

		break;



		memcpy((void *)hwinfo,

		       (void *)&rtlefuse->efuse_map[EFUSE_INIT_MAP][0],

		       HWSET_MAX_SIZE);

	} else if (rtlefuse->epromtype == EEPROM_93C46) {

	case EEPROM_93C46:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "RTL819X Not boot from eeprom, check it !!");

		return;



	default:

		dev_warn(dev, "no efuse data\n");

		return;

	}



	memcpy(hwinfo, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0], HWSET_MAX_SIZE);



	RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP",

		      hwinfo, HWSET_MAX_SIZE);

drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c

+11 −5
Original line number Diff line number Diff line
@@ -351,15 +351,21 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw) 
	u8 hwinfo[HWSET_MAX_SIZE] = {0};

	u16 eeprom_id;



	if (rtlefuse->epromtype == EEPROM_BOOT_EFUSE) {

	switch (rtlefuse->epromtype) {

	case EEPROM_BOOT_EFUSE:

		rtl_efuse_shadow_map_update(hw);

		memcpy((void *)hwinfo,

		       (void *)&rtlefuse->efuse_map[EFUSE_INIT_MAP][0],

		       HWSET_MAX_SIZE);

	} else if (rtlefuse->epromtype == EEPROM_93C46) {

		break;



	case EEPROM_93C46:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "RTL819X Not boot from eeprom, check it !!\n");

		return;



	default:

		pr_warn("rtl92cu: no efuse data\n\n");

		return;

	}

	memcpy(hwinfo, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0], HWSET_MAX_SIZE);

	RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_LOUD, "MAP",

		      hwinfo, HWSET_MAX_SIZE);

	eeprom_id = le16_to_cpu(*((__le16 *)&hwinfo[0]));

drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c

+11 −5
Original line number Diff line number Diff line
@@ -1744,23 +1744,29 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));

	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));

	struct device *dev = &rtl_pcipriv(hw)->dev.pdev->dev;

	u16 i, usvalue;

	u8 hwinfo[HWSET_MAX_SIZE];

	u16 eeprom_id;

	unsigned long flags;



	if (rtlefuse->epromtype == EEPROM_BOOT_EFUSE) {

	switch (rtlefuse->epromtype) {

	case EEPROM_BOOT_EFUSE:

		spin_lock_irqsave(&globalmutex_for_power_and_efuse, flags);

		rtl_efuse_shadow_map_update(hw);

		_rtl92de_efuse_update_chip_version(hw);

		spin_unlock_irqrestore(&globalmutex_for_power_and_efuse, flags);

		memcpy((void *)hwinfo, (void *)&rtlefuse->efuse_map

		       [EFUSE_INIT_MAP][0],

		       HWSET_MAX_SIZE);

	} else if (rtlefuse->epromtype == EEPROM_93C46) {

		break;

	case EEPROM_93C46:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "RTL819X Not boot from eeprom, check it !!\n");

		return;

	default:

		dev_warn(dev, "no efuse data\n");

		return;

	}



	memcpy(hwinfo, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0], HWSET_MAX_SIZE);

	RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP",

		      hwinfo, HWSET_MAX_SIZE);

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c

+7 −5
Original line number Diff line number Diff line
@@ -2102,20 +2102,22 @@ static void _rtl92ee_read_adapter_info(struct ieee80211_hw *hw) 
	u8 hwinfo[HWSET_MAX_SIZE];

	u16 eeprom_id;



	if (rtlefuse->epromtype == EEPROM_BOOT_EFUSE) {

	switch (rtlefuse->epromtype) {

	case EEPROM_BOOT_EFUSE:

		rtl_efuse_shadow_map_update(hw);

		break;



		memcpy(hwinfo, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0],

		       HWSET_MAX_SIZE);

	} else if (rtlefuse->epromtype == EEPROM_93C46) {

	case EEPROM_93C46:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "RTL819X Not boot from eeprom, check it !!");

		return;

	} else {



	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "boot from neither eeprom nor efuse, check it !!");

		return;

	}

	memcpy(hwinfo, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0], HWSET_MAX_SIZE);



	RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP\n",

		      hwinfo, HWSET_MAX_SIZE);