Unverified Commit fe70e8f1 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9274 wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Changzhong <zhangchangzhong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WBJGL7E3XDMDHYPHWIZIXJ7KKGKAH62M/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9Q990 
 
Link:https://gitee.com/openeuler/kernel/pulls/9274

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents d7ac518a a804ac0f

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+2 −2
Original line number Diff line number Diff line
@@ -787,8 +787,7 @@ s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg, 
	scan_request = cfg->scan_request;

	cfg->scan_request = NULL;



	if (timer_pending(&cfg->escan_timeout))

		del_timer_sync(&cfg->escan_timeout);

	timer_delete_sync(&cfg->escan_timeout);



	if (fw_abort) {

		/* Do a scan abort to stop the driver's scan engine */
@@ -7656,6 +7655,7 @@ void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg) 
	brcmf_btcoex_detach(cfg);

	wiphy_unregister(cfg->wiphy);

	wl_deinit_priv(cfg);

	cancel_work_sync(&cfg->escan_timeout_work);

	brcmf_free_wiphy(cfg->wiphy);

	kfree(cfg);

}