diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-17 11:21:50 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-17 14:44:34 +0300 |
| commit | cd8dd41a33264a4602539711f76670c2a1f4d007 (patch) | |
| tree | 02dc88065f7ef16bf68912944e0a21f824354e56 /drivers/spi/spi-imx.c | |
| parent | 793c7f9212fdb7bea5e017427e750afa11217c29 (diff) | |
| download | linux-cd8dd41a33264a4602539711f76670c2a1f4d007.tar.xz | |
spi: imx: Fix possible NULL pointer deref
transfer could be NULL in spi_imx_can_dma() when it's called from
spi_imx_setupxfer() with a NULL transfer. Test for a NULL pointer before
dereferencing it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-imx.c')
| -rw-r--r-- | drivers/spi/spi-imx.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index b79d70d6dabf..50769078e72e 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -211,11 +211,15 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi, struct spi_transfer *transfer) { struct spi_imx_data *spi_imx = spi_master_get_devdata(master); - unsigned int bpw = transfer->bits_per_word; + unsigned int bpw; if (!master->dma_rx) return false; + if (!transfer) + return false; + + bpw = transfer->bits_per_word; if (!bpw) bpw = spi->bits_per_word; |