diff mbox series

[v2] EDAC/versal: Fix possible null pointer dereference in emif_get_id()

Message ID 20240710010746.1741228-1-make24@iscas.ac.cn (mailing list archive)
State New
Headers show
Series [v2] EDAC/versal: Fix possible null pointer dereference in emif_get_id() | expand

Commit Message

Ma Ke July 10, 2024, 1:07 a.m. UTC
In emif_get_id(), of_get_address() may return NULL which is later
dereferenced. Fix this bug by adding NULL check.

Fixes: 6f15b178cd63 ("EDAC/versal: Add a Xilinx Versal memory controller driver")
Signed-off-by: Ma Ke <make24@iscas.ac.cn>
---
Changes in v2:
- fixed the typo according to suggestions.
---
 drivers/edac/versal_edac.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Markus Elfring July 10, 2024, 9:16 a.m. UTC | #1
> Signed-off-by: Ma Ke <make24@iscas.ac.cn>

Do you care for the applicability of the available information
according to this tag?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.10-rc7#n398

Regards,
Markus
diff mbox series

Patch

diff --git a/drivers/edac/versal_edac.c b/drivers/edac/versal_edac.c
index a556d23e8261..d837edac30e7 100644
--- a/drivers/edac/versal_edac.c
+++ b/drivers/edac/versal_edac.c
@@ -1053,6 +1053,9 @@  static u32 emif_get_id(struct device_node *node)
 	const __be32 *addrp;
 
 	addrp = of_get_address(node, 0, NULL, NULL);
+	if (!addrp)
+		return -EINVAL;
+
 	my_addr = (u32)of_translate_address(node, addrp);
 
 	for_each_matching_node(np, xlnx_edac_match) {
@@ -1060,6 +1063,9 @@  static u32 emif_get_id(struct device_node *node)
 			continue;
 
 		addrp = of_get_address(np, 0, NULL, NULL);
+		if (!addrp)
+			return -EINVAL;
+
 		addr = (u32)of_translate_address(np, addrp);
 
 		edac_printk(KERN_INFO, EDAC_MC,