async_pq: Remove VLA usage

[linux-2.6-microblaze.git] / crypto / async_tx / async_pq.c

diff --git a/crypto/async_tx/async_pq.c b/crypto/async_tx/async_pq.c
index 56bd612..80dc567 100644 (file)
--- a/crypto/async_tx/async_pq.c
+++ b/crypto/async_tx/async_pq.c
@@ -42,6 +42,8 @@ static struct page *pq_scribble_page;
 #define P(b, d) (b[d-2])
 #define Q(b, d) (b[d-1])
 
+#define MAX_DISKS 255
+
 /**
  * do_async_gen_syndrome - asynchronously calculate P and/or Q
  */
@@ -184,7 +186,7 @@ async_gen_syndrome(struct page **blocks, unsigned int offset, int disks,
        struct dma_device *device = chan ? chan->device : NULL;
        struct dmaengine_unmap_data *unmap = NULL;
 
-       BUG_ON(disks > 255 || !(P(blocks, disks) || Q(blocks, disks)));
+       BUG_ON(disks > MAX_DISKS || !(P(blocks, disks) || Q(blocks, disks)));
 
        if (device)
                unmap = dmaengine_get_unmap_data(device->dev, disks, GFP_NOWAIT);
@@ -196,7 +198,7 @@ async_gen_syndrome(struct page **blocks, unsigned int offset, int disks,
            is_dma_pq_aligned(device, offset, 0, len)) {
                struct dma_async_tx_descriptor *tx;
                enum dma_ctrl_flags dma_flags = 0;
-               unsigned char coefs[src_cnt];
+               unsigned char coefs[MAX_DISKS];
                int i, j;
 
                /* run the p+q asynchronously */
@@ -299,11 +301,11 @@ async_syndrome_val(struct page **blocks, unsigned int offset, int disks,
        struct dma_chan *chan = pq_val_chan(submit, blocks, disks, len);
        struct dma_device *device = chan ? chan->device : NULL;
        struct dma_async_tx_descriptor *tx;
-       unsigned char coefs[disks-2];
+       unsigned char coefs[MAX_DISKS];
        enum dma_ctrl_flags dma_flags = submit->cb_fn ? DMA_PREP_INTERRUPT : 0;
        struct dmaengine_unmap_data *unmap = NULL;
 
-       BUG_ON(disks < 4);
+       BUG_ON(disks < 4 || disks > MAX_DISKS);
 
        if (device)
                unmap = dmaengine_get_unmap_data(device->dev, disks, GFP_NOWAIT);