diff mbox series

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

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

Commit Message

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

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

Comments

Datta, Shubhrajyoti July 18, 2024, 2:53 p.m. UTC | #1
[AMD Official Use Only - AMD Internal Distribution Only]

> -----Original Message-----
> From: Ma Ke <make24@iscas.ac.cn>
> Sent: Thursday, July 18, 2024 7:06 PM
> To: Datta, Shubhrajyoti <shubhrajyoti.datta@amd.com>; Potthuri, Sai
> Krishna <sai.krishna.potthuri@amd.com>; bp@alien8.de;
> tony.luck@intel.com; james.morse@arm.com; mchehab@kernel.org;
> rric@kernel.org
> Cc: linux-edac@vger.kernel.org; linux-kernel@vger.kernel.org; Ma Ke
> <make24@iscas.ac.cn>; stable@vger.kernel.org
> Subject: [PATCH v3] EDAC/versal: Fix possible null pointer dereference in
> emif_get_id()
>
> Caution: This message originated from an External Source. Use proper
> caution when opening attachments, clicking links, or responding.
>
>
> In emif_get_id(), of_get_address() may return NULL which is later
> dereferenced. Fix this bug by adding NULL check.
>
> Cc: stable@vger.kernel.org
> Fixes: 6f15b178cd63 ("EDAC/versal: Add a Xilinx Versal memory controller
> driver")
> Signed-off-by: Ma Ke <make24@iscas.ac.cn>

Reviewed-by: Shubhrajyoti Datta <shubhrajyoti.datta@amd.com>
diff mbox series

Patch

diff --git a/drivers/edac/versal_edac.c b/drivers/edac/versal_edac.c
index a556d23e8261..7aa9468acd53 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) {