Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mtd: avoid stack overflow in MTD CFI code

When map_word gets too large, we use a lot of kernel stack, and for
MTD_MAP_BANK_WIDTH_32, this means we use more than the recommended
1024 bytes in a number of functions:

drivers/mtd/chips/cfi_cmdset_0020.c: In function 'cfi_staa_write_buffers':
drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1336 bytes is larger than 1024 bytes [-Wframe-larger-than=]
drivers/mtd/chips/cfi_cmdset_0020.c: In function 'cfi_staa_erase_varsize':
drivers/mtd/chips/cfi_cmdset_0020.c:972:1: warning: the frame size of 1208 bytes is larger than 1024 bytes [-Wframe-larger-than=]
drivers/mtd/chips/cfi_cmdset_0001.c: In function 'do_write_buffer':
drivers/mtd/chips/cfi_cmdset_0001.c:1835:1: warning: the frame size of 1240 bytes is larger than 1024 bytes [-Wframe-larger-than=]

This can be avoided if all operations on the map word are done
indirectly and the stack gets reused between the calls. We can
mostly achieve this by selecting MTD_COMPLEX_MAPPINGS whenever
MTD_MAP_BANK_WIDTH_32 is set, but for the case that no other
bank width is enabled, we also need to use a non-constant
map_bankwidth() to convince the compiler to use less stack.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[Brian: this patch mostly achieves its goal by forcing
MTD_COMPLEX_MAPPINGS (and the accompanying indirection) for 256-bit
mappings; the rest of the change is mostly a wash, though it helps
reduce stack size slightly. If we really care about supporting
256-bit mappings though, we should consider rewriting some of this
code to avoid keeping and assigning so many 256-bit objects on the
stack.]
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

authored by

Arnd Bergmann and committed by
Brian Norris
fddcca51 20c07a5b

+8 -12
+1
drivers/mtd/chips/Kconfig
··· 115 115 116 116 config MTD_MAP_BANK_WIDTH_32 117 117 bool "Support 256-bit buswidth" if MTD_CFI_GEOMETRY 118 + select MTD_COMPLEX_MAPPINGS if HAS_IOMEM 118 119 default n 119 120 help 120 121 If you wish to support CFI devices on a physical bus which is
+7 -12
include/linux/mtd/map.h
··· 122 122 #endif 123 123 124 124 #ifdef CONFIG_MTD_MAP_BANK_WIDTH_32 125 - # ifdef map_bankwidth 126 - # undef map_bankwidth 127 - # define map_bankwidth(map) ((map)->bankwidth) 128 - # undef map_bankwidth_is_large 129 - # define map_bankwidth_is_large(map) (map_bankwidth(map) > BITS_PER_LONG/8) 130 - # undef map_words 131 - # define map_words(map) map_calc_words(map) 132 - # else 133 - # define map_bankwidth(map) 32 134 - # define map_bankwidth_is_large(map) (1) 135 - # define map_words(map) map_calc_words(map) 136 - # endif 125 + /* always use indirect access for 256-bit to preserve kernel stack */ 126 + # undef map_bankwidth 127 + # define map_bankwidth(map) ((map)->bankwidth) 128 + # undef map_bankwidth_is_large 129 + # define map_bankwidth_is_large(map) (map_bankwidth(map) > BITS_PER_LONG/8) 130 + # undef map_words 131 + # define map_words(map) map_calc_words(map) 137 132 #define map_bankwidth_is_32(map) (map_bankwidth(map) == 32) 138 133 #undef MAX_MAP_BANKWIDTH 139 134 #define MAX_MAP_BANKWIDTH 32