FAILED: patch "[PATCH] serial: altera_jtaguart: handle uart_add_one_port() failures" failed to apply to 5.15-stable tree
[email protected]
maintainerThe patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x ea66be25f0e934f49d24cd0c5845d13cdba3520b
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026060422-eskimo-docile-6e8f@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From ea66be25f0e934f49d24cd0c5845d13cdba3520b Mon Sep 17 00:00:00 2001
From: Myeonghun Pak <[email protected]>
Date: Tue, 12 May 2026 15:56:57 +0900
Subject: [PATCH] serial: altera_jtaguart: handle uart_add_one_port() failures
altera_jtaguart_probe() maps the register window before registering the UART port, but it ignores failures from uart_add_one_port(). If port registration fails, probe still returns success and the mapping remains live until a later remove path that is not part of probe failure cleanup.
Return the uart_add_one_port() error and unmap the register window on that failure path.
This issue was identified during our ongoing static-analysis research while reviewing kernel code.
drivers/tty/serial/altera_jtaguart.c +6 -1
@@ -379,6 +379,7 @@ static int altera_jtaguart_probe(struct platform_device *pdev)struct resource *res_mem;int i = pdev->id;int irq; +int ret;/* -1 emphasizes that the platform must have one port, no .N suffix */ if (i ==-1 )
@@ -418,7 +419,11 @@ static int altera_jtaguart_probe(struct platform_device *pdev) port->flags =UPF_BOOT_AUTOCONF ; port->dev = &pdev->dev; -uart_add_one_port (&altera_jtaguart_driver, port); + ret =uart_add_one_port (&altera_jtaguart_driver, port); +if (ret) { +iounmap (port->membase); +return ret; + }return 0 ; }
Sasha Levin
maintainerPATCH 1/2 serial: altera_jtaguart: Use platform_get_irq_optional() to get the interrupt
From: Lad Prabhakar <[email protected]>
[ Upstream commit 60302276caff50f907bc3391a364691ab4a21b43 ]
platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static allocation of IRQ resources in DT core code, this causes an issue when using hierarchical interrupt domains using "interrupts" property in the node as this bypasses the hierarchical setup and messes up the irq chaining.
In preparation for removal of static setup of IRQ resource from DT core code use platform_get_irq_optional().
Stable-dep-of: ea66be25f0e9 ("serial: altera_jtaguart: handle uart_add_one_port() failures")
--- drivers/tty/serial/altera_jtaguart.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/tty/serial/altera_jtaguart.c +7 -4
@@ -418,8 +418,9 @@ static int altera_jtaguart_probe(struct platform_device *pdev)struct altera_jtaguart_platform_uart *platp =dev_get_platdata (&pdev->dev);struct uart_port *port; -struct resource *res_irq, *res_mem; +struct resource *res_mem;int i = pdev->id; +int irq;/* -1 emphasizes that the platform must have one port, no .N suffix */ if (i ==-1 )
@@ -438,9 +439,11 @@ static int altera_jtaguart_probe(struct platform_device *pdev)else return -ENODEV ; - res_irq =platform_get_resource (pdev,IORESOURCE_IRQ ,0 ); -if (res_irq) - port->irq = res_irq->start; + irq =platform_get_irq_optional (pdev,0 ); +if (irq <0 && irq != -ENXIO ) +return irq; +if (irq >0 ) + port->irq = irq;else if (platp) port->irq = platp->irq;else
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 serial: altera_jtaguart: handle uart_add_one_port() failures
From: Myeonghun Pak <[email protected]>
[ Upstream commit ea66be25f0e934f49d24cd0c5845d13cdba3520b ]
altera_jtaguart_probe() maps the register window before registering the UART port, but it ignores failures from uart_add_one_port(). If port registration fails, probe still returns success and the mapping remains live until a later remove path that is not part of probe failure cleanup.
Return the uart_add_one_port() error and unmap the register window on that failure path.
This issue was identified during our ongoing static-analysis research while reviewing kernel code.
--- drivers/tty/serial/altera_jtaguart.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/tty/serial/altera_jtaguart.c +6 -1
@@ -421,6 +421,7 @@ static int altera_jtaguart_probe(struct platform_device *pdev)struct resource *res_mem;int i = pdev->id;int irq; +int ret;/* -1 emphasizes that the platform must have one port, no .N suffix */ if (i ==-1 )
@@ -460,7 +461,11 @@ static int altera_jtaguart_probe(struct platform_device *pdev) port->flags =UPF_BOOT_AUTOCONF ; port->dev = &pdev->dev; -uart_add_one_port (&altera_jtaguart_driver, port); + ret =uart_add_one_port (&altera_jtaguart_driver, port); +if (ret) { +iounmap (port->membase); +return ret; + }return 0 ; }
Signature · 1 line
2.53.0