From 8299e173e009ed91fc7d42d48cabc7634035e3c0 Mon Sep 17 00:00:00 2001 From: Henry Martin Date: Fri, 11 Jul 2025 03:14:45 +0000 Subject: [PATCH] serial: Fix potential null-ptr-deref in mlb_usio_probe() stable inclusion from stable-v6.6.94 commit a6c7c365734cd0fa1c5aa225a6294fdf80cad2ea category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/ICJT9C CVE: CVE-2025-38135 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a6c7c365734cd0fa1c5aa225a6294fdf80cad2ea -------------------------------- [ Upstream commit 86bcae88c9209e334b2f8c252f4cc66beb261886 ] devm_ioremap() can return NULL on error. Currently, mlb_usio_probe() does not check for this case, which could result in a NULL pointer dereference. Add NULL check after devm_ioremap() to prevent this issue. Fixes: ba44dc043004 ("serial: Add Milbeaut serial control") Signed-off-by: Henry Martin Link: https://lore.kernel.org/r/20250403070339.64990-1-bsdhenrymartin@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin Signed-off-by: Yi Yang --- drivers/tty/serial/milbeaut_usio.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/milbeaut_usio.c b/drivers/tty/serial/milbeaut_usio.c index 70a910085e93..9de3883a4e0b 100644 --- a/drivers/tty/serial/milbeaut_usio.c +++ b/drivers/tty/serial/milbeaut_usio.c @@ -522,7 +522,10 @@ static int mlb_usio_probe(struct platform_device *pdev) } port->membase = devm_ioremap(&pdev->dev, res->start, resource_size(res)); - + if (!port->membase) { + ret = -ENOMEM; + goto failed; + } ret = platform_get_irq_byname(pdev, "rx"); mlb_usio_irq[index][RX] = ret; -- Gitee