]> git.baikalelectronics.ru Git - kernel.git/commitdiff
serial: sprd: Fix a dereference warning
authorLanqing Liu <liuhhome@gmail.com>
Mon, 16 Mar 2020 03:13:33 +0000 (11:13 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 2 Apr 2020 13:10:59 +0000 (15:10 +0200)
commit a18c40264add8260d933b18561f3b0578a35fac1 upstream.

We should validate if the 'sup' is NULL or not before freeing DMA
memory, to fix below warning.

"drivers/tty/serial/sprd_serial.c:1141 sprd_remove()
 error: we previously assumed 'sup' could be null (see line 1132)"

Fixes: 92147b6714fe ("serial: sprd: Add DMA mode support")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Lanqing Liu <liuhhome@gmail.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/e2bd92691538e95b04a2c2a728f3292e1617018f.1584325957.git.liuhhome@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/sprd_serial.c

index 494e2672ebd734cc53dbf17412d7070cff688d8a..07573de70445c65034067e4f3c32da8b8916322f 100644 (file)
@@ -1103,14 +1103,13 @@ static int sprd_remove(struct platform_device *dev)
        if (sup) {
                uart_remove_one_port(&sprd_uart_driver, &sup->port);
                sprd_port[sup->port.line] = NULL;
+               sprd_rx_free_buf(sup);
                sprd_ports_num--;
        }
 
        if (!sprd_ports_num)
                uart_unregister_driver(&sprd_uart_driver);
 
-       sprd_rx_free_buf(sup);
-
        return 0;
 }