]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
serial: max310x: Fix to avoid potential NULL pointer dereference
authorAditya Pakki <pakki001@umn.edu>
Mon, 18 Mar 2019 23:44:14 +0000 (18:44 -0500)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 13 Aug 2019 11:38:46 +0000 (12:38 +0100)
commit 3a10e3dd52e80b9a97a3346020024d17b2c272d6 upstream.

of_match_device can return a NULL pointer when matching device is not
found. This patch avoids a scenario causing NULL pointer derefernce.

Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/tty/serial/max310x.c

index ba285cd45b59f50c3ca4716895a784e0f30e4a12..8ccab7cf437c99d34826b6e6d6727fca7b68ef06 100644 (file)
@@ -1324,6 +1324,8 @@ static int max310x_spi_probe(struct spi_device *spi)
        if (spi->dev.of_node) {
                const struct of_device_id *of_id =
                        of_match_device(max310x_dt_ids, &spi->dev);
+               if (!of_id)
+                       return -ENODEV;
 
                devtype = (struct max310x_devtype *)of_id->data;
        } else {