Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1599846 > unrolled thread
| Started by | Matthias Kaehlcke <mka@chromium.org> |
|---|---|
| First post | 2017-03-13 22:40 +0100 |
| Last post | 2017-03-14 05:50 +0100 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] dma-engine: Fix array index out of bounds warning in __get_unmap_pool() Matthias Kaehlcke <mka@chromium.org> - 2017-03-13 22:40 +0100
Re: [PATCH] dma-engine: Fix array index out of bounds warning in __get_unmap_pool() Dan Williams <dan.j.williams@intel.com> - 2017-03-13 23:00 +0100
Re: [PATCH] dma-engine: Fix array index out of bounds warning in __get_unmap_pool() Vinod Koul <vinod.koul@intel.com> - 2017-03-14 05:50 +0100
| From | Matthias Kaehlcke <mka@chromium.org> |
|---|---|
| Date | 2017-03-13 22:40 +0100 |
| Subject | [PATCH] dma-engine: Fix array index out of bounds warning in __get_unmap_pool() |
| Message-ID | <tkFR8-6IY-31@gated-at.bofh.it> |
This fixes the following warning when building with clang and
CONFIG_DMA_ENGINE_RAID=n :
drivers/dma/dmaengine.c:1102:11: error: array index 2 is past the end of the array (which contains 1 element) [-Werror,-Warray-bounds]
return &unmap_pool[2];
^ ~
drivers/dma/dmaengine.c:1083:1: note: array 'unmap_pool' declared here
static struct dmaengine_unmap_pool unmap_pool[] = {
^
drivers/dma/dmaengine.c:1104:11: error: array index 3 is past the end of the array (which contains 1 element) [-Werror,-Warray-bounds]
return &unmap_pool[3];
^ ~
drivers/dma/dmaengine.c:1083:1: note: array 'unmap_pool' declared here
static struct dmaengine_unmap_pool unmap_pool[] = {
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
---
drivers/dma/dmaengine.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index 6b535262ac5d..3db94e81bc14 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -1107,12 +1107,14 @@ static struct dmaengine_unmap_pool *__get_unmap_pool(int nr)
switch (order) {
case 0 ... 1:
return &unmap_pool[0];
+#if IS_ENABLED(CONFIG_DMA_ENGINE_RAID)
case 2 ... 4:
return &unmap_pool[1];
case 5 ... 7:
return &unmap_pool[2];
case 8:
return &unmap_pool[3];
+#endif
default:
BUG();
return NULL;
--
2.12.0.246.ga2ecc84866-goog
[toc] | [next] | [standalone]
| From | Dan Williams <dan.j.williams@intel.com> |
|---|---|
| Date | 2017-03-13 23:00 +0100 |
| Message-ID | <tkGat-6RP-5@gated-at.bofh.it> |
| In reply to | #1599846 |
On Mon, Mar 13, 2017 at 2:30 PM, Matthias Kaehlcke <mka@chromium.org> wrote:
> This fixes the following warning when building with clang and
> CONFIG_DMA_ENGINE_RAID=n :
>
> drivers/dma/dmaengine.c:1102:11: error: array index 2 is past the end of the array (which contains 1 element) [-Werror,-Warray-bounds]
> return &unmap_pool[2];
> ^ ~
> drivers/dma/dmaengine.c:1083:1: note: array 'unmap_pool' declared here
> static struct dmaengine_unmap_pool unmap_pool[] = {
> ^
> drivers/dma/dmaengine.c:1104:11: error: array index 3 is past the end of the array (which contains 1 element) [-Werror,-Warray-bounds]
> return &unmap_pool[3];
> ^ ~
> drivers/dma/dmaengine.c:1083:1: note: array 'unmap_pool' declared here
> static struct dmaengine_unmap_pool unmap_pool[] = {
>
> Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
[toc] | [prev] | [next] | [standalone]
| From | Vinod Koul <vinod.koul@intel.com> |
|---|---|
| Date | 2017-03-14 05:50 +0100 |
| Subject | Re: [PATCH] dma-engine: Fix array index out of bounds warning in __get_unmap_pool() |
| Message-ID | <tkMzf-3eo-5@gated-at.bofh.it> |
| In reply to | #1599846 |
On Mon, Mar 13, 2017 at 02:30:29PM -0700, Matthias Kaehlcke wrote:
> This fixes the following warning when building with clang and
> CONFIG_DMA_ENGINE_RAID=n :
>
> drivers/dma/dmaengine.c:1102:11: error: array index 2 is past the end of the array (which contains 1 element) [-Werror,-Warray-bounds]
> return &unmap_pool[2];
> ^ ~
> drivers/dma/dmaengine.c:1083:1: note: array 'unmap_pool' declared here
> static struct dmaengine_unmap_pool unmap_pool[] = {
> ^
> drivers/dma/dmaengine.c:1104:11: error: array index 3 is past the end of the array (which contains 1 element) [-Werror,-Warray-bounds]
> return &unmap_pool[3];
> ^ ~
> drivers/dma/dmaengine.c:1083:1: note: array 'unmap_pool' declared here
> static struct dmaengine_unmap_pool unmap_pool[] = {
Applied, thanks
--
~Vinod
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web