diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-09-11 11:21:45 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-09-13 22:56:40 -0400 |
| commit | c456797681db814f4f5b36909e8e94047bf53d9c (patch) | |
| tree | e50e29b88da24c9145a212611bb4ea249473d263 /drivers | |
| parent | c618a9be0e8c0f36baee2560860a0118a428fb26 (diff) | |
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: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Stable <stable@vger.kernel.org> [2.6.31+]
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/at_hdmac.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index 6c09e186e960..7ab6e26664a7 100644 --- a/drivers/dma/at_hdmac.c +++ b/drivers/dma/at_hdmac.c | |||
| @@ -689,6 +689,11 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, | |||
| 689 | 689 | ||
| 690 | mem = sg_dma_address(sg); | 690 | mem = sg_dma_address(sg); |
| 691 | len = sg_dma_len(sg); | 691 | len = sg_dma_len(sg); |
| 692 | if (unlikely(!len)) { | ||
| 693 | dev_dbg(chan2dev(chan), | ||
| 694 | "prep_slave_sg: sg(%d) data length is zero\n", i); | ||
| 695 | goto err; | ||
| 696 | } | ||
| 692 | mem_width = 2; | 697 | mem_width = 2; |
| 693 | if (unlikely(mem & 3 || len & 3)) | 698 | if (unlikely(mem & 3 || len & 3)) |
| 694 | mem_width = 0; | 699 | mem_width = 0; |
| @@ -724,6 +729,11 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, | |||
| 724 | 729 | ||
| 725 | mem = sg_dma_address(sg); | 730 | mem = sg_dma_address(sg); |
| 726 | len = sg_dma_len(sg); | 731 | len = sg_dma_len(sg); |
| 732 | if (unlikely(!len)) { | ||
| 733 | dev_dbg(chan2dev(chan), | ||
| 734 | "prep_slave_sg: sg(%d) data length is zero\n", i); | ||
| 735 | goto err; | ||
| 736 | } | ||
| 727 | mem_width = 2; | 737 | mem_width = 2; |
| 728 | if (unlikely(mem & 3 || len & 3)) | 738 | if (unlikely(mem & 3 || len & 3)) |
| 729 | mem_width = 0; | 739 | mem_width = 0; |
| @@ -757,6 +767,7 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, | |||
| 757 | 767 | ||
| 758 | err_desc_get: | 768 | err_desc_get: |
| 759 | dev_err(chan2dev(chan), "not enough descriptors available\n"); | 769 | dev_err(chan2dev(chan), "not enough descriptors available\n"); |
| 770 | err: | ||
| 760 | atc_desc_put(atchan, first); | 771 | atc_desc_put(atchan, first); |
| 761 | return NULL; | 772 | return NULL; |
| 762 | } | 773 | } |
