summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorAditya Pakki <pakki001@umn.edu>2019-03-18 18:44:14 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-03-19 15:37:43 +0100
commit3a10e3dd52e80b9a97a3346020024d17b2c272d6 (patch)
tree0219be2339df1feabbba996e5438792afe5b77b0 /drivers/tty
parent32f47179833b63de72427131169809065db6745e (diff)
downloadlinux-3a10e3dd52e80b9a97a3346020024d17b2c272d6.tar.gz
linux-3a10e3dd52e80b9a97a3346020024d17b2c272d6.tar.bz2
linux-3a10e3dd52e80b9a97a3346020024d17b2c272d6.zip
serial: max310x: Fix to avoid potential NULL pointer dereference
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>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/max310x.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index f5bdde405627..450ba6d7996c 100644
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -1415,6 +1415,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 {