diff options
| author | Aditya Pakki <pakki001@umn.edu> | 2019-03-18 18:44:14 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-03 06:25:18 +0200 |
| commit | 0d42abfacfcedc695964d655495c0dbb34e22647 (patch) | |
| tree | ce82561aae02627d942d904407f73cccb2bfb8f7 /drivers/tty | |
| parent | 6c8f9d93c2c7861c0caffe3c9b378c891c92ef39 (diff) | |
| download | linux-stable-0d42abfacfcedc695964d655495c0dbb34e22647.tar.gz linux-stable-0d42abfacfcedc695964d655495c0dbb34e22647.tar.bz2 linux-stable-0d42abfacfcedc695964d655495c0dbb34e22647.zip | |
serial: max310x: Fix to avoid potential NULL pointer dereference
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>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/max310x.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c index 9dfedbe6c071..54660002271a 100644 --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c @@ -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 { |