| Message ID | 20230104093353.48239-1-jiasheng@iscas.ac.cn (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: rtw89: Add missing check for alloc_workqueue | expand |
On Wed, Jan 04, 2023 at 05:33:53PM +0800, Jiasheng Jiang wrote: > Add check for the return value of alloc_workqueue since it may return > NULL pointer. > > Fixes: e3ec7017f6a2 ("rtw89: add Realtek 802.11ax driver") > Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> > --- > drivers/net/wireless/realtek/rtw89/core.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c > index 931aff8b5dc9..006fe0499f81 100644 > --- a/drivers/net/wireless/realtek/rtw89/core.c > +++ b/drivers/net/wireless/realtek/rtw89/core.c > @@ -3124,6 +3124,8 @@ int rtw89_core_init(struct rtw89_dev *rtwdev) > INIT_DELAYED_WORK(&rtwdev->cfo_track_work, rtw89_phy_cfo_track_work); > INIT_DELAYED_WORK(&rtwdev->forbid_ba_work, rtw89_forbid_ba_work); > rtwdev->txq_wq = alloc_workqueue("rtw89_tx_wq", WQ_UNBOUND | WQ_HIGHPRI, 0); > + if (!rtwdev->txq_wq) > + return -ENOMEM; While the change is fixing one issue, you are adding another one. There is no destroy of this workqueue if rtw89_load_firmware fails. Thanks > spin_lock_init(&rtwdev->ba_lock); > spin_lock_init(&rtwdev->rpwm_lock); > mutex_init(&rtwdev->mutex); > -- > 2.25.1 >
diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c index 931aff8b5dc9..006fe0499f81 100644 --- a/drivers/net/wireless/realtek/rtw89/core.c +++ b/drivers/net/wireless/realtek/rtw89/core.c @@ -3124,6 +3124,8 @@ int rtw89_core_init(struct rtw89_dev *rtwdev) INIT_DELAYED_WORK(&rtwdev->cfo_track_work, rtw89_phy_cfo_track_work); INIT_DELAYED_WORK(&rtwdev->forbid_ba_work, rtw89_forbid_ba_work); rtwdev->txq_wq = alloc_workqueue("rtw89_tx_wq", WQ_UNBOUND | WQ_HIGHPRI, 0); + if (!rtwdev->txq_wq) + return -ENOMEM; spin_lock_init(&rtwdev->ba_lock); spin_lock_init(&rtwdev->rpwm_lock); mutex_init(&rtwdev->mutex);
Add check for the return value of alloc_workqueue since it may return NULL pointer. Fixes: e3ec7017f6a2 ("rtw89: add Realtek 802.11ax driver") Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> --- drivers/net/wireless/realtek/rtw89/core.c | 2 ++ 1 file changed, 2 insertions(+)