Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4567976 authored by Nicolas Ferre's avatar Nicolas Ferre Committed by Vinod Koul
Browse files

dmaengine: at_hdmac: check that each sg data length is non-null 



Avoid the construction of a malformed DMA request sent to
the DMA controller.
Log message is for debug only because this condition is unlikely to
append and may only trigger at driver development time.

Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Cc: Stable <stable@vger.kernel.org> [2.6.31+]
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent c618a9be

drivers/dma/at_hdmac.c

+11 −0
Original line number Diff line number Diff line
@@ -689,6 +689,11 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 


			mem = sg_dma_address(sg);

			len = sg_dma_len(sg);

			if (unlikely(!len)) {

				dev_dbg(chan2dev(chan),

					"prep_slave_sg: sg(%d) data length is zero\n", i);

				goto err;

			}

			mem_width = 2;

			if (unlikely(mem & 3 || len & 3))

				mem_width = 0;
@@ -724,6 +729,11 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 


			mem = sg_dma_address(sg);

			len = sg_dma_len(sg);

			if (unlikely(!len)) {

				dev_dbg(chan2dev(chan),

					"prep_slave_sg: sg(%d) data length is zero\n", i);

				goto err;

			}

			mem_width = 2;

			if (unlikely(mem & 3 || len & 3))

				mem_width = 0;
@@ -757,6 +767,7 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 


err_desc_get:

	dev_err(chan2dev(chan), "not enough descriptors available\n");

err:

	atc_desc_put(atchan, first);

	return NULL;

}