diff options
| author | Dave Jiang <dave.jiang@intel.com> | 2015-08-25 21:58:11 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-08-26 04:23:58 +0200 |
| commit | 7b7d0ca7778d359584859cb5e75965ad34f42533 (patch) | |
| tree | 6f4fdd86026e38af82fe190436d6001c911b1fc8 /drivers/dma | |
| parent | dmaengine: ioatdma: fix sparse "error" with prep lock (diff) | |
| download | linux-7b7d0ca7778d359584859cb5e75965ad34f42533.tar.xz linux-7b7d0ca7778d359584859cb5e75965ad34f42533.zip | |
dmaengine: ioatdma: Fix variable array length
Sparse reported:
drivers/dma/ioat/prep.c:637:27: sparse: Variable length array is used.
Assigning a static value for the array.
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/ioat/prep.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/dma/ioat/prep.c b/drivers/dma/ioat/prep.c index e323a4036908..ad4fb41cd23b 100644 --- a/drivers/dma/ioat/prep.c +++ b/drivers/dma/ioat/prep.c @@ -26,6 +26,8 @@ #include "hw.h" #include "dma.h" +#define MAX_SCF 1024 + /* provide a lookup table for setting the source address in the base or * extended descriptor of an xor or pq descriptor */ @@ -634,9 +636,12 @@ struct dma_async_tx_descriptor * ioat_prep_pqxor(struct dma_chan *chan, dma_addr_t dst, dma_addr_t *src, unsigned int src_cnt, size_t len, unsigned long flags) { - unsigned char scf[src_cnt]; + unsigned char scf[MAX_SCF]; dma_addr_t pq[2]; + if (src_cnt > MAX_SCF) + return NULL; + memset(scf, 0, src_cnt); pq[0] = dst; flags |= DMA_PREP_PQ_DISABLE_Q; @@ -654,9 +659,12 @@ ioat_prep_pqxor_val(struct dma_chan *chan, dma_addr_t *src, unsigned int src_cnt, size_t len, enum sum_check_flags *result, unsigned long flags) { - unsigned char scf[src_cnt]; + unsigned char scf[MAX_SCF]; dma_addr_t pq[2]; + if (src_cnt > MAX_SCF) + return NULL; + /* the cleanup routine only sets bits on validate failure, it * does not clear bits on validate success... so clear it here */ |