Commit 2088cfd8 authored by Michal Simek's avatar Michal Simek Committed by Greg Kroah-Hartman

serial: uartps: Do not allow use aliases >= MAX_UART_INSTANCES

Aliases >= MAX_UART_INSTANCES is no problem to find out and use but in
error path is necessary skip clearing bits in bitmap to ensure that only
bits in allocated bitmap are handled and nothing beyond that.
Without this patch when for example serial90 alias is used then in error
patch bit 90 is clear in 32bit wide bitmap.

Fixes: ae1cca3f ("serial: uartps: Change uart ID port allocation")
Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 33a1a7be
...@@ -1668,6 +1668,7 @@ static int cdns_uart_probe(struct platform_device *pdev) ...@@ -1668,6 +1668,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
uart_unregister_driver(cdns_uart_data->cdns_uart_driver); uart_unregister_driver(cdns_uart_data->cdns_uart_driver);
err_out_id: err_out_id:
mutex_lock(&bitmap_lock); mutex_lock(&bitmap_lock);
if (cdns_uart_data->id < MAX_UART_INSTANCES)
clear_bit(cdns_uart_data->id, bitmap); clear_bit(cdns_uart_data->id, bitmap);
mutex_unlock(&bitmap_lock); mutex_unlock(&bitmap_lock);
return rc; return rc;
...@@ -1693,6 +1694,7 @@ static int cdns_uart_remove(struct platform_device *pdev) ...@@ -1693,6 +1694,7 @@ static int cdns_uart_remove(struct platform_device *pdev)
rc = uart_remove_one_port(cdns_uart_data->cdns_uart_driver, port); rc = uart_remove_one_port(cdns_uart_data->cdns_uart_driver, port);
port->mapbase = 0; port->mapbase = 0;
mutex_lock(&bitmap_lock); mutex_lock(&bitmap_lock);
if (cdns_uart_data->id < MAX_UART_INSTANCES)
clear_bit(cdns_uart_data->id, bitmap); clear_bit(cdns_uart_data->id, bitmap);
mutex_unlock(&bitmap_lock); mutex_unlock(&bitmap_lock);
clk_disable_unprepare(cdns_uart_data->uartclk); clk_disable_unprepare(cdns_uart_data->uartclk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment