diff options
| author | John David Anglin <dave.anglin@bell.net> | 2022-01-27 22:33:41 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-23 11:58:37 +0100 |
| commit | a32bb343edc9c6dbce3b2679795bfb76b0bf5f60 (patch) | |
| tree | 66ba2b5c3236eb9d2ca3745bdb31717a2ae03648 /drivers/parisc | |
| parent | 867e50231c7605547d9334904d70a181f39f2d9e (diff) | |
| download | linux-stable-a32bb343edc9c6dbce3b2679795bfb76b0bf5f60.tar.gz linux-stable-a32bb343edc9c6dbce3b2679795bfb76b0bf5f60.tar.bz2 linux-stable-a32bb343edc9c6dbce3b2679795bfb76b0bf5f60.zip | |
parisc: Fix sglist access in ccio-dma.c
commit d7da660cab47183cded65e11b64497d0f56c6edf upstream.
This patch implements the same bug fix to ccio-dma.c as to sba_iommu.c.
It ensures that only the allocated entries of the sglist are accessed.
Signed-off-by: John David Anglin <dave.anglin@bell.net>
Cc: stable@vger.kernel.org
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/parisc')
| -rw-r--r-- | drivers/parisc/ccio-dma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index b7b2e811d547..6efab7a06c5f 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c @@ -1010,7 +1010,7 @@ ccio_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents, ioc->usg_calls++; #endif - while(sg_dma_len(sglist) && nents--) { + while (nents && sg_dma_len(sglist)) { #ifdef CCIO_COLLECT_STATS ioc->usg_pages += sg_dma_len(sglist) >> PAGE_SHIFT; @@ -1018,6 +1018,7 @@ ccio_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents, ccio_unmap_page(dev, sg_dma_address(sglist), sg_dma_len(sglist), direction, 0); ++sglist; + nents--; } DBG_RUN_SG("%s() DONE (nents %d)\n", __func__, nents); |