diff mbox series

mm: check the return value of ioremap() in macio_init()

Message ID 20220802074148.3213659-1-studentxswpy@163.com (mailing list archive)
State Accepted
Commit dbaa3105736d4d73063ea0a3b01cd7fafce924e6
Headers show
Series mm: check the return value of ioremap() in macio_init() | expand

Checks

Context Check Description
snowpatch_ozlabs/github-powerpc_kernel_qemu success Successfully ran 23 jobs.
snowpatch_ozlabs/github-powerpc_sparse success Successfully ran 4 jobs.

Commit Message

studentxswpy@163.com Aug. 2, 2022, 7:41 a.m. UTC 
From: Xie Shaowen <studentxswpy@163.com>

The function ioremap() in macio_init() can fail, so
its return value should be checked.

Fixes: 36874579dbf4c ("[PATCH] powerpc: macio-adb build fix")
Reported-by: Hacash Robot <hacashRobot@santino.com>
Signed-off-by: Xie Shaowen <studentxswpy@163.com>
---
 drivers/macintosh/macio-adb.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Michael Ellerman Nov. 30, 2022, 9:23 a.m. UTC | #1 
On Tue, 2 Aug 2022 15:41:48 +0800, studentxswpy@163.com wrote:
> From: Xie Shaowen <studentxswpy@163.com>
> 
> The function ioremap() in macio_init() can fail, so
> its return value should be checked.
> 
> 

Applied to powerpc/next.

[1/1] mm: check the return value of ioremap() in macio_init()
      https://git.kernel.org/powerpc/c/dbaa3105736d4d73063ea0a3b01cd7fafce924e6

cheers
diff mbox series

Patch

diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c
index 9b63bd2551c6..cd4e34d15c26 100644
--- a/drivers/macintosh/macio-adb.c
+++ b/drivers/macintosh/macio-adb.c
@@ -108,6 +108,10 @@  int macio_init(void)
 		return -ENXIO;
 	}
 	adb = ioremap(r.start, sizeof(struct adb_regs));
+	if (!adb) {
+		of_node_put(adbs);
+		return -ENOMEM;
+	}
 
 	out_8(&adb->ctrl.r, 0);
 	out_8(&adb->intr.r, 0);