]> git.ipfire.org Git - people/arne_f/kernel.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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Apr 2019 04:24:18 +0000 (06:24 +0200)
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>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/max310x.c

index 8a3e92638e1076a3c6f7af6ad38cd9fc46d91c53..5331baf3f699b61d12e345fca185ef08b197f1a8 100644 (file)
@@ -1323,6 +1323,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 {