* [PATCH v2 1/3] serial: liteuart: fix use-after-free and memleak on unbind
[not found] <20211117100512.5058-1-johan@kernel.org>
@ 2021-11-17 10:05 ` Johan Hovold
2021-11-17 10:05 ` [PATCH v2 2/3] serial: liteuart: fix minor-number leak on probe errors Johan Hovold
1 sibling, 0 replies; 2+ messages in thread
From: Johan Hovold @ 2021-11-17 10:05 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Ilia Sergachev, Karol Gugala, Mateusz Holenko, Stafford Horne,
Andy Shevchenko, linux-serial, linux-kernel, Johan Hovold,
stable, Filip Kokosinski
Deregister the port when unbinding the driver to prevent it from being
used after releasing the driver data and leaking memory allocated by
serial core.
Fixes: 1da81e5562fa ("drivers/tty/serial: add LiteUART driver")
Cc: stable@vger.kernel.org # 5.11
Cc: Filip Kokosinski <fkokosinski@antmicro.com>
Cc: Mateusz Holenko <mholenko@antmicro.com>
Reviewed-by: Stafford Horne <shorne@gmail.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/tty/serial/liteuart.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/tty/serial/liteuart.c b/drivers/tty/serial/liteuart.c
index f075f4ff5fcf..da792d0df790 100644
--- a/drivers/tty/serial/liteuart.c
+++ b/drivers/tty/serial/liteuart.c
@@ -295,6 +295,7 @@ static int liteuart_remove(struct platform_device *pdev)
struct uart_port *port = platform_get_drvdata(pdev);
struct liteuart_port *uart = to_liteuart_port(port);
+ uart_remove_one_port(&liteuart_driver, port);
xa_erase(&liteuart_array, uart->id);
return 0;
--
2.32.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH v2 2/3] serial: liteuart: fix minor-number leak on probe errors
[not found] <20211117100512.5058-1-johan@kernel.org>
2021-11-17 10:05 ` [PATCH v2 1/3] serial: liteuart: fix use-after-free and memleak on unbind Johan Hovold
@ 2021-11-17 10:05 ` Johan Hovold
1 sibling, 0 replies; 2+ messages in thread
From: Johan Hovold @ 2021-11-17 10:05 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Ilia Sergachev, Karol Gugala, Mateusz Holenko, Stafford Horne,
Andy Shevchenko, linux-serial, linux-kernel, Johan Hovold,
stable, Filip Kokosinski
Make sure to release the allocated minor number before returning on
probe errors.
Fixes: 1da81e5562fa ("drivers/tty/serial: add LiteUART driver")
Cc: stable@vger.kernel.org # 5.11
Cc: Filip Kokosinski <fkokosinski@antmicro.com>
Cc: Mateusz Holenko <mholenko@antmicro.com>
Reviewed-by: Stafford Horne <shorne@gmail.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/tty/serial/liteuart.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/serial/liteuart.c b/drivers/tty/serial/liteuart.c
index da792d0df790..2941659e5274 100644
--- a/drivers/tty/serial/liteuart.c
+++ b/drivers/tty/serial/liteuart.c
@@ -270,8 +270,10 @@ static int liteuart_probe(struct platform_device *pdev)
/* get membase */
port->membase = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
- if (IS_ERR(port->membase))
- return PTR_ERR(port->membase);
+ if (IS_ERR(port->membase)) {
+ ret = PTR_ERR(port->membase);
+ goto err_erase_id;
+ }
/* values not from device tree */
port->dev = &pdev->dev;
@@ -287,7 +289,16 @@ static int liteuart_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, port);
- return uart_add_one_port(&liteuart_driver, &uart->port);
+ ret = uart_add_one_port(&liteuart_driver, &uart->port);
+ if (ret)
+ goto err_erase_id;
+
+ return 0;
+
+err_erase_id:
+ xa_erase(&liteuart_array, uart->id);
+
+ return ret;
}
static int liteuart_remove(struct platform_device *pdev)
--
2.32.0
^ permalink raw reply related [flat|nested] 2+ messages in thread