linux-kernel - Re: [PATCH -next] wifi: rtw88: add missing destroy_workqueue() on error path in rtw_core

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <39e21608-c7e2-422a-1e05-e7ebb250ecac@huawei.com>
Date:   Fri, 26 Aug 2022 09:56:39 +0800
From:   Yang Yingliang <yangyingliang@...wei.com>
To:     Ping-Ke Shih <pkshih@...ltek.com>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
        "linux-wireless@...r.kernel.org" <linux-wireless@...r.kernel.org>
CC:     "tony0620emma@...il.com" <tony0620emma@...il.com>,
        "kvalo@...nel.org" <kvalo@...nel.org>,
        Bernie Huang <phhuang@...ltek.com>
Subject: Re: [PATCH -next] wifi: rtw88: add missing destroy_workqueue() on
 error path in rtw_core_init()

Hi,

On 2022/8/26 8:44, Ping-Ke Shih wrote:
>> -----Original Message-----
>> From: Yang Yingliang <yangyingliang@...wei.com>
>> Sent: Thursday, August 25, 2022 9:38 PM
>> To: linux-kernel@...r.kernel.org; netdev@...r.kernel.org; linux-wireless@...r.kernel.org
>> Cc: tony0620emma@...il.com; kvalo@...nel.org; Bernie Huang <phhuang@...ltek.com>
>> Subject: [PATCH -next] wifi: rtw88: add missing destroy_workqueue() on error path in rtw_core_init()
>>
>> Add the missing destroy_workqueue() before return from rtw_core_init()
>> in error path.
>>
>> Fixes: fe101716c7c9 ("rtw88: replace tx tasklet with work queue")
>> Signed-off-by: Yang Yingliang <yangyingliang@...wei.com>
>> ---
>>   drivers/net/wireless/realtek/rtw88/main.c | 8 ++++++--
>>   1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
>> index 790dcfed1125..557213e52761 100644
>> --- a/drivers/net/wireless/realtek/rtw88/main.c
>> +++ b/drivers/net/wireless/realtek/rtw88/main.c
>> @@ -2094,7 +2094,7 @@ int rtw_core_init(struct rtw_dev *rtwdev)
>>   	ret = rtw_load_firmware(rtwdev, RTW_NORMAL_FW);
>>   	if (ret) {
>>   		rtw_warn(rtwdev, "no firmware loaded\n");
>> -		return ret;
>> +		goto destroy_workqueue;
>>   	}
>>
>>   	if (chip->wow_fw_name) {
>> @@ -2104,11 +2104,15 @@ int rtw_core_init(struct rtw_dev *rtwdev)
>>   			wait_for_completion(&rtwdev->fw.completion);
>>   			if (rtwdev->fw.firmware)
>>   				release_firmware(rtwdev->fw.firmware);
>> -			return ret;
>> +			goto destroy_workqueue;
>>   		}
>>   	}
>>
>>   	return 0;
>> +
>> +destroy_workqueue:
> It's not so good that the label 'destroy_workqueue' is the same as function name.
> I suggest to just use 'out' instead.
How about 'out_destory_workqueue' ?

Thanks,
Yang
>
>> +	destroy_workqueue(rtwdev->tx_wq);
>> +	return ret;
>>   }
>>   EXPORT_SYMBOL(rtw_core_init);
>>
>> --
>> 2.25.1
>>
>>
>> ------Please consider the environment before printing this e-mail.
> .