diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-12-08 19:47:45 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-12-08 19:47:46 -0800 |
| commit | ecd6df3c1ba8ad8befd82fc8f0d2438e8d3c75cc (patch) | |
| tree | b25ff39cdc0900ef790378b223e49d0de1f286c6 /drivers/net/ethernet/mediatek/mtk_wed_mcu.c | |
| parent | 3df96774a4224fd96a54eff7446425f1fbd76006 (diff) | |
| parent | 587585e1bbebc250d46ebb0eeaf986d9c3c01c69 (diff) | |
Merge branch 'fix-possible-deadlock-during-wed-attach'
Lorenzo Bianconi says:
====================
fix possible deadlock during WED attach
Fix a possible deadlock in mtk_wed_attach if mtk_wed_wo_init routine fails.
Check wo pointer is properly allocated before running mtk_wed_wo_reset() and
mtk_wed_wo_deinit().
====================
Link: https://lore.kernel.org/r/cover.1670421354.git.lorenzo@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/mediatek/mtk_wed_mcu.c')
| -rw-r--r-- | drivers/net/ethernet/mediatek/mtk_wed_mcu.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c index f9539e6233c9..6bad0d262f28 100644 --- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c +++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c @@ -207,6 +207,9 @@ int mtk_wed_mcu_msg_update(struct mtk_wed_device *dev, int id, void *data, if (dev->hw->version == 1) return 0; + if (WARN_ON(!wo)) + return -ENODEV; + return mtk_wed_mcu_send_msg(wo, MTK_WED_MODULE_ID_WO, id, data, len, true); } |