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:27:33 +0200 |
| commit | 763eafe0dbf56e5ec2bbdf21c6106d37e6af9724 (patch) | |
| tree | 82acbaa62f8812b706d7388cab0c6164dc9173f1 /drivers/tty/serial | |
| parent | 198b7b7fb6b627044286513349b03391d0adf18e (diff) | |
| download | blackbird-obmc-linux-763eafe0dbf56e5ec2bbdf21c6106d37e6af9724.tar.gz blackbird-obmc-linux-763eafe0dbf56e5ec2bbdf21c6106d37e6af9724.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/serial')
| -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 4f479841769a..0fdf3a760aa0 100644 --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c @@ -1416,6 +1416,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 { |
