wifi: rsi: Do not configure WoWlan in shutdown hook if not enabled
Subsystems (3)
PATCH 1/1 wifi: rsi: Do not configure WoWlan in shutdown hook if not enabled
In case WoWlan was never configured during the operation of the system, the hw->wiphy->wowlan_config will be NULL. rsi_config_wowlan() checks whether wowlan_config is non-NULL and if it is not, then WARNs about it. The warning is valid, as during normal operation the rsi_config_wowlan() should only ever be called with non-NULL wowlan_config. In shutdown this rsi_config_wowlan() should only ever be called if WoWlan was configured before by the user.
Add checks for non-NULL wowlan_config into the shutdown hook. While at it, check whether the wiphy is also non-NULL before accessing wowlan_config . Drop the single-use wowlan_config variable, just inline it into function call.
---
Cc: "David S. Miller" <[email protected]>
Cc: Eric Dumazet <[email protected]>
Cc: Jakub Kicinski <[email protected]>
Cc: Jilin Yuan <[email protected]>
Cc: Kalle Valo <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Paolo Abeni <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- drivers/net/wireless/rsi/rsi_91x_sdio.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/wireless/rsi/rsi_91x_sdio.c +2 -4
@@ -1463,10 +1463,8 @@ static void rsi_shutdown(struct device *dev)rsi_dbg (ERR_ZONE ,"SDIO Bus shutdown =====>\n" ); -if (hw) { -struct cfg80211_wowlan *wowlan = hw->wiphy->wowlan_config; - -if (rsi_config_wowlan (adapter, wowlan)) +if (hw && hw->wiphy && hw->wiphy->wowlan_config) { +if (rsi_config_wowlan (adapter, hw->wiphy->wowlan_config))rsi_dbg (ERR_ZONE ,"Failed to configure WoWLAN\n" ); }
Signature · 1 line
2.39.2
Quoted 8 lines · Marek Vasut
In case WoWlan was never configured during the operation of the system, the
hw->wiphy->wowlan_configwill be NULL.rsi_config_wowlan()checks whetherwowlan_configis non-NULL and if it is not, then WARNs about it. The warning is valid, as during normal operation thersi_config_wowlan()should only ever be called with non-NULLwowlan_config. In shutdown thisrsi_config_wowlan()should only ever be called if WoWlan was configured before by the user.
Quoted 6 lines
Add checks for non-NULL
wowlan_configinto the shutdown hook. While at it, check whether the wiphy is also non-NULL before accessingwowlan_config. Drop the single-usewowlan_configvariable, just inline it into function call.Fixes 16bbc3eb8372 ("rsi: fix null pointer dereference during rsi_shutdown()")
nit: no blank line here
Quoted 1 line
Signed-off-by Marek Vasut <[email protected]>
Quoted 9 lines · Simon Horman
Quoted 8 lines · Marek Vasut
In case WoWlan was never configured during the operation of the system, the
hw->wiphy->wowlan_configwill be NULL.rsi_config_wowlan()checks whetherwowlan_configis non-NULL and if it is not, then WARNs about it. The warning is valid, as during normal operation thersi_config_wowlan()should only ever be called with non-NULLwowlan_config. In shutdown thisrsi_config_wowlan()should only ever be called if WoWlan was configured before by the user.
Quoted 8 lines
Quoted 6 lines
Add checks for non-NULL
wowlan_configinto the shutdown hook. While at it, check whether the wiphy is also non-NULL before accessingwowlan_config. Drop the single-usewowlan_configvariable, just inline it into function call.Fixes 16bbc3eb8372 ("rsi: fix null pointer dereference during rsi_shutdown()")nit: no blank line here
Sigh, there was no blank line here.
Sorry for the noise.
Quoted 3 lines
Quoted 1 line
Signed-off-by Marek Vasut <[email protected]>Reviewed-by Simon Horman <[email protected]>
Quoted 8 lines · Marek Vasut
In case WoWlan was never configured during the operation of the system, the
hw->wiphy->wowlan_configwill be NULL.rsi_config_wowlan()checks whetherwowlan_configis non-NULL and if it is not, then WARNs about it. The warning is valid, as during normal operation thersi_config_wowlan()should only ever be called with non-NULLwowlan_config. In shutdown thisrsi_config_wowlan()should only ever be called if WoWlan was configured before by the user.
Quoted 8 lines
Add checks for non-NULL
wowlan_configinto the shutdown hook. While at it, check whether the wiphy is also non-NULL before accessingwowlan_config. Drop the single-usewowlan_configvariable, just inline it into function call.Fixes 16bbc3eb8372 ("rsi: fix null pointer dereference during rsi_shutdown()")Signed-off-by Marek Vasut <[email protected]>Reviewed-by Simon Horman <[email protected]>
Patch applied to wireless-next.git, thanks.
b241e260820b wifi: rsi: Do not configure WoWlan in shutdown hook if not enabled
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches