shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

wifi: rtlwifi: fix memory leaks and invalid access at probe error path

Browse Source 
[ Upstream commit e7ceefbfd8d447abc8aca8ab993a942803522c06 ]

Deinitialize at reverse order when probe fails.

When init_sw_vars fails, rtl_deinit_core should not be called, specially
now that it destroys the rtl_wq workqueue.

And call rtl_pci_deinit and deinit_sw_vars, otherwise, memory will be
leaked.

Remove pci_set_drvdata call as it will already be cleaned up by the core
driver code and could lead to memory leaks too. cf. commit 8d450935ae
("wireless: rtlwifi: remove unnecessary pci_set_drvdata()") and
commit 3d86b93064 ("rtlwifi: Fix PCI probe error path orphaned memory").

Fixes: 0c8173385e ("rtl8192ce: Add new driver")
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20241206173713.3222187-4-cascardo@igalia.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Thadeu Lima de Souza Cascardo
2024-12-06 14:37:12 -03:00
committed by Greg Kroah-Hartman
parent 283bdc0ce7
commit ee0b0d7baa
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/wireless/realtek/rtlwifi/pci.c
View File

@@ -2167,7 +2167,7 @@ int rtl_pci_probe(struct pci_dev *pdev,
if (rtlpriv->cfg->ops->init_sw_vars(hw)) { if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
pr_err("Can't init_sw_vars\n"); pr_err("Can't init_sw_vars\n");
err = -ENODEV; err = -ENODEV;
goto fail3; goto fail2;
} }
rtlpriv->cfg->ops->init_sw_leds(hw); rtlpriv->cfg->ops->init_sw_leds(hw);
@@ -2185,14 +2185,14 @@ int rtl_pci_probe(struct pci_dev *pdev,
err = rtl_pci_init(hw, pdev); err = rtl_pci_init(hw, pdev);
if (err) { if (err) {
pr_err("Failed to init PCI\n"); pr_err("Failed to init PCI\n");
goto fail3; goto fail4;
} }
err = ieee80211_register_hw(hw); err = ieee80211_register_hw(hw);
if (err) { if (err) {
pr_err("Can't register mac80211 hw.\n"); pr_err("Can't register mac80211 hw.\n");
err = -ENODEV; err = -ENODEV;
goto fail3; goto fail5;
} }
rtlpriv->mac80211.mac80211_registered = 1; rtlpriv->mac80211.mac80211_registered = 1;
@@ -2215,9 +2215,12 @@ int rtl_pci_probe(struct pci_dev *pdev,
set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status); set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
return 0; return 0;
fail3: fail5:
pci_set_drvdata(pdev, NULL); rtl_pci_deinit(hw);
fail4:
rtl_deinit_core(hw); rtl_deinit_core(hw);
fail3:
rtlpriv->cfg->ops->deinit_sw_vars(hw);
fail2: fail2:
if (rtlpriv->io.pci_mem_start != 0) if (rtlpriv->io.pci_mem_start != 0)