lkml.org 
[lkml]   [2017]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 029/156] dmaengine: Fix array index out of bounds warning in __get_unmap_pool()
    Date
    From: Matthias Kaehlcke <mka@chromium.org>

    [ Upstream commit 23f963e91fd81f44f6b316b1c24db563354c6be8 ]

    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>
    Signed-off-by: Vinod Koul <vinod.koul@intel.com>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    ---
    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.11.0
    \
     
     \ /
      Last update: 2017-12-07 18:47    [W:5.356 / U:0.428 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site