lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 263/800] ia64: mca_drv: fix incorrect array size calculation
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    [ Upstream commit c5f320ff8a79501bb59338278336ec43acb9d7e2 ]

    gcc points out a mistake in the mca driver that goes back to before the
    git history:

    arch/ia64/kernel/mca_drv.c: In function 'init_record_index_pools':
    arch/ia64/kernel/mca_drv.c:346:54: error: expression does not compute the number of elements in this array; element typ
    e is 'int', not 'size_t' {aka 'long unsigned int'} [-Werror=sizeof-array-div]
    346 | for (i = 1; i < sizeof sal_log_sect_min_sizes/sizeof(size_t); i++)
    | ^

    This is the same as sizeof(size_t), which is two shorter than the actual
    array. Use the ARRAY_SIZE() macro to get the correct calculation instead.

    Link: https://lkml.kernel.org/r/20210514214123.875971-1-arnd@kernel.org
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Cc: Masahiro Yamada <masahiroy@kernel.org>
    Cc: Randy Dunlap <rdunlap@infradead.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/ia64/kernel/mca_drv.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c
    index 36a69b4e6169..5bfc79be4cef 100644
    --- a/arch/ia64/kernel/mca_drv.c
    +++ b/arch/ia64/kernel/mca_drv.c
    @@ -343,7 +343,7 @@ init_record_index_pools(void)

    /* - 2 - */
    sect_min_size = sal_log_sect_min_sizes[0];
    - for (i = 1; i < sizeof sal_log_sect_min_sizes/sizeof(size_t); i++)
    + for (i = 1; i < ARRAY_SIZE(sal_log_sect_min_sizes); i++)
    if (sect_min_size > sal_log_sect_min_sizes[i])
    sect_min_size = sal_log_sect_min_sizes[i];

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:41    [W:2.271 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site