Skip to contentSkip to conversation

wifi: mt76: mt7996: Fix null-ptr-deref in mt7996_mmio_wed_init()

PATCH In review Henry Martin 2 participants 3 messages Apr 3, 2025 – Apr 7, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 wifi: mt76: mt7996: Fix null-ptr-deref in mt7996_mmio_wed_init()

devm_ioremap() returns NULL on error. Currently, mt7996_mmio_wed_init() does not check for this case, which results in a NULL pointer dereference.

Add NULL check after devm_ioremap() to prevent this issue.

Fixes 83eafc9251d6 ("wifi: mt76: mt7996: add wed tx support")
---
 drivers/net/wireless/mediatek/mt76/mt7996/mmio.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7996/mmio.c +2 -0
index 13b188e281bd..5bade83238bd 100644
@@ -323,6 +323,8 @@ int mt7996_mmio_wed_init(struct mt7996_dev *dev, void *pdev_ptr,
 	wed->wlan.base = devm_ioremap(dev->mt76.dev,
 				      pci_resource_start(pci_dev, 0),
 				      pci_resource_len(pci_dev, 0));
+	if (!wed->wlan.base)
+		return -ENOMEM;
 	wed->wlan.phy_base = pci_resource_start(pci_dev, 0);
 
 	if (hif2) {
Signature · 1 line
2.34.1
#1 lore raw

…

Quoted 1 line

Add NULL check after devm_ioremap() to prevent this issue.

Can a summary phrase like “Prevent null pointer dereference in mt7996_mmio_wed_init()” be a bit nicer?

…

drivers/net/wireless/mediatek/mt76/mt7996/mmio.c int mt7996_mmio_wed_init(struct mt7996_dev *dev, void *pdev_ptr, · line 327

Quoted 7 lines

+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c

drivers/net/wireless/mediatek/mt76/mt7996/mmio.c +2 -0
@@ -323,6 +323,8 @@ int mt7996_mmio_wed_init(struct mt7996_dev *dev, void *pdev_ptr,
 	wed->wlan.base = devm_ioremap(dev->mt76.dev,
 				      pci_resource_start(pci_dev, 0),
 				      pci_resource_len(pci_dev, 0));
+	if (!wed->wlan.base)
+		return -ENOMEM;

Can a blank line be desirable after such a statement?

Regards,
Markus

#2 lore raw

Ok, I will correct them in V2.

Regards,
Henry

Quoted 21 lines · Markus Elfring <[email protected]> 于2025年4月3日周四 18:13写道:

…

Quoted 1 line

Add NULL check after devm_ioremap() to prevent this issue.

Can a summary phrase like “Prevent null pointer dereference in mt7996_mmio_wed_init()” be a bit nicer?

…

drivers/net/wireless/mediatek/mt76/mt7996/mmio.c int mt7996_mmio_wed_init(struct mt7996_dev *dev, void *pdev_ptr, · line 327

Quoted 7 lines

+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c

drivers/net/wireless/mediatek/mt76/mt7996/mmio.c +2 -0
@@ -323,6 +323,8 @@ int mt7996_mmio_wed_init(struct mt7996_dev *dev, void *pdev_ptr,
      wed->wlan.base = devm_ioremap(dev->mt76.dev,
                                    pci_resource_start(pci_dev, 0),
                                    pci_resource_len(pci_dev, 0));
+     if (!wed->wlan.base)
+             return -ENOMEM;

Can a blank line be desirable after such a statement?

Regards,
Markus