[PATCH] NTB/msi: fix NULL deref when msi_first_desc() returns NULL
From: zhangjiao2
Date: Fri Nov 20 2026 - 03:38:22 EST
From: zhang jiao <zhangjiao2@xxxxxxxxxxxxxxxxxxxx>
msi_first_desc() can return NULL if no MSI descriptors are found,
but ntb_msi_setup_mws() dereferences desc->msg unconditionally
inside the scoped_guard block. Add a NULL check and return -ENODEV
to prevent a null pointer dereference.
Signed-off-by: zhang jiao <zhangjiao2@xxxxxxxxxxxxxxxxxxxx>
---
drivers/ntb/msi.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/ntb/msi.c b/drivers/ntb/msi.c
index 13e9f52ec8cc..cfe2125b2fe0 100644
--- a/drivers/ntb/msi.c
+++ b/drivers/ntb/msi.c
@@ -108,6 +108,8 @@ int ntb_msi_setup_mws(struct ntb_dev *ntb)
scoped_guard (msi_descs_lock, &ntb->pdev->dev) {
desc = msi_first_desc(&ntb->pdev->dev, MSI_DESC_ASSOCIATED);
+ if (!desc)
+ return -ENODEV;
addr = desc->msg.address_lo + ((uint64_t)desc->msg.address_hi << 32);
}
--
2.33.0