diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-10 00:50:02 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-10 00:50:02 (GMT) |
| commit | d08edd8f09a0bc7f28c9559d134ffc37ff264962 (patch) | |
| tree | 527d857382761d626a3a1283077ed33a1fef5c01 /drivers/spi/spi-img-spfi.c | |
| parent | eca8dac4fa477cb26eb6478f4a5d2cf381128753 (diff) | |
| parent | 60c1beeff40b04097298e10640580f62420a55ca (diff) | |
| download | linux-d08edd8f09a0bc7f28c9559d134ffc37ff264962.tar.xz | |
Merge tag 'spi-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fixes from Mark Brown:
"A collection of driver specific fixes to which the usual comments
about them being important if you see them mostly apply (except for
the comment fix). The pl022 one is particularly nasty for anyone
affected by it"
* tag 'spi-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
spi: pl022: Fix race in giveback() leading to driver lock-up
spi: dw-mid: avoid potential NULL dereference
spi: img-spfi: Verify max spfi transfer length
spi: fix a typo in comment.
spi: atmel: Fix interrupt setup for PDC transfers
spi: dw: revisit FIFO size detection again
spi: dw-pci: correct number of chip selects
drivers: spi: ti-qspi: wait for busy bit clear before data write/read
Diffstat (limited to 'drivers/spi/spi-img-spfi.c')
| -rw-r--r-- | drivers/spi/spi-img-spfi.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c index c01567d..e649bc7 100644 --- a/drivers/spi/spi-img-spfi.c +++ b/drivers/spi/spi-img-spfi.c @@ -459,6 +459,13 @@ static int img_spfi_transfer_one(struct spi_master *master, unsigned long flags; int ret; + if (xfer->len > SPFI_TRANSACTION_TSIZE_MASK) { + dev_err(spfi->dev, + "Transfer length (%d) is greater than the max supported (%d)", + xfer->len, SPFI_TRANSACTION_TSIZE_MASK); + return -EINVAL; + } + /* * Stop all DMA and reset the controller if the previous transaction * timed-out and never completed it's DMA. |