* [PATCH v1] wifi: mt76: mt7996: Fix null-ptr-deref in mt7996_mmio_wed_init()
@ 2025-04-03 6:43 Henry Martin
2025-04-03 10:13 ` [PATCH] " Markus Elfring
0 siblings, 1 reply; 3+ messages in thread
From: Henry Martin @ 2025-04-03 6:43 UTC (permalink / raw)
To: nbd, lorenzo, ryder.lee, shayne.chen, sean.wang, matthias.bgg,
angelogioacchino.delregno, wiagn233, rex.lu, chui-hao.chiu,
bsdhenrymartin
Cc: linux-wireless, linux-kernel, linux-arm-kernel, linux-mediatek
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")
Signed-off-by: Henry Martin <bsdhenrymartin@gmail.com>
---
drivers/net/wireless/mediatek/mt76/mt7996/mmio.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c
index 13b188e281bd..5bade83238bd 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c
@@ -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) {
--
2.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] wifi: mt76: mt7996: Fix null-ptr-deref in mt7996_mmio_wed_init()
2025-04-03 6:43 [PATCH v1] wifi: mt76: mt7996: Fix null-ptr-deref in mt7996_mmio_wed_init() Henry Martin
@ 2025-04-03 10:13 ` Markus Elfring
2025-04-07 3:15 ` henry martin
0 siblings, 1 reply; 3+ messages in thread
From: Markus Elfring @ 2025-04-03 10:13 UTC (permalink / raw)
To: Henry Martin, linux-wireless, linux-mediatek, linux-arm-kernel
Cc: LKML, Angelo Gioacchino Del Regno, Peter Chiu, Felix Fietkau,
Lorenzo Bianconi, Matthias Brugger, Rex Lu, Ryder Lee, Sean Wang,
Shayne Chen, Shengyu Qu
…
> 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?
…
> +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c
> @@ -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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] wifi: mt76: mt7996: Fix null-ptr-deref in mt7996_mmio_wed_init()
2025-04-03 10:13 ` [PATCH] " Markus Elfring
@ 2025-04-07 3:15 ` henry martin
0 siblings, 0 replies; 3+ messages in thread
From: henry martin @ 2025-04-07 3:15 UTC (permalink / raw)
To: Markus Elfring
Cc: linux-wireless, linux-mediatek, linux-arm-kernel, LKML,
Angelo Gioacchino Del Regno, Peter Chiu, Felix Fietkau,
Lorenzo Bianconi, Matthias Brugger, Rex Lu, Ryder Lee, Sean Wang,
Shayne Chen, Shengyu Qu
Ok, I will correct them in V2.
Regards,
Henry
Markus Elfring <Markus.Elfring@web.de> 于2025年4月3日周四 18:13写道：
>
> …
> > 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?
>
>
> …
> > +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c
> > @@ -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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-04-07 3:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-04-03 6:43 [PATCH v1] wifi: mt76: mt7996: Fix null-ptr-deref in mt7996_mmio_wed_init() Henry Martin
2025-04-03 10:13 ` [PATCH] " Markus Elfring
2025-04-07 3:15 ` henry martin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®