• Kees Cook's avatar
    eeprom: at25: Restore missing allocation · a6501e4b
    Kees Cook authored
    The at25 driver regressed in v5.17-rc1 due to a broken conflict
    resolution: the allocation of the object was accidentally removed. Restore
    it.
    
    This was found when building under CONFIG_FORTIFY_SOURCE=y and
    -Warray-bounds, which complained about strncpy() being used against an
    empty object:
    
    In function 'strncpy',
        inlined from 'at25_fw_to_chip.constprop' at drivers/misc/eeprom/at25.c:312:2:
    ./include/linux/fortify-string.h:48:33: warning: '__builtin_strncpy' offset [0, 9] is out of the bounds [0, 0] [-Warray-bounds]
       48 | #define __underlying_strncpy    __builtin_strncpy
          |                                 ^
    ./include/linux/fortify-string.h:59:16: note: in expansion of macro '__underlying_strncpy'
       59 |         return __underlying_strncpy(p, q, size);
          |                ^~~~~~~~~~~~~~~~~~~~
    In function 'strncpy',
        inlined from 'at25_fram_to_chip' at drivers/misc/eeprom/at25.c:373:2,
        inlined from 'at25_probe' at drivers/misc/eeprom/at25.c:453:10:
    ./include/linux/fortify-string.h:48:33: warning: '__builtin_strncpy' offset [0, 9] is out of the bounds [0, 0] [-Warray-bounds]
       48 | #define __underlying_strncpy    __builtin_strncpy
          |                                 ^
    ./include/linux/fortify-string.h:59:16: note: in expansion of macro '__underlying_strncpy'
       59 |         return __underlying_strncpy(p, q, size);
          |                ^~~~~~~~~~~~~~~~~~~~
    
    Link: https://lore.kernel.org/lkml/CAHp75VdqK7h63fz-cPaQ2MGaVdaR2f1Fb5kKCZidUG3RwLsAVA@mail.gmail.com/
    Fixes: af40d160 ("Merge v5.15-rc5 into char-misc-next")
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Jiri Prchal <jiri.prchal@aksignal.cz>
    Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
    Signed-off-by: default avatarKees Cook <keescook@chromium.org>
    Link: https://lore.kernel.org/r/20220118182003.3385019-1-keescook@chromium.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
    a6501e4b
at25.c 12.7 KB