From: Marek Vasut Date: Mon, 20 May 2013 03:01:40 +0000 (+0200) Subject: ppc: ppmc7xx: Fix possible out-of-bound access X-Git-Tag: v2013.07-rc1~4^2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8cf695537f55f6574d2a85ae4ddc5b9c9f0d26b3;p=oweals%2Fu-boot.git ppc: ppmc7xx: Fix possible out-of-bound access The flash_info_t->start[] field is limited in size by CONFIG_SYS_MAX_FLASH_SECT macro, which is set to 19 for this board in the board config file. If we inspect the board/ppmc7xx/flash.c closely, especially the flash_get_size() function, we can notice the "switch ((long)flashtest)" at around line 80 having a few results which will set flash_info_t->sector_count to value higher than 19, for example "case AMD_ID_LV640U" will set it to 128. Notice that right underneath, iteration over flash_info_t->start[] happens and the upper bound for the interation is flash_info_t->sector_count. Now if the sector_count is 128 as it is for the AMD_ID_LV640U case, but the CONFIG_SYS_MAX_FLASH_SECT limiting the start[] is only 19, an access past the start[] array much happen. Moreover, during this iteration, the field is written to, so memory corruption is inevitable. Signed-off-by: Marek Vasut Cc: Wolfgang Denk Cc: Tom Rini Cc: Richard Danter --- diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h index 233d87d5e7..3f9fdd444d 100644 --- a/include/configs/ppmc7xx.h +++ b/include/configs/ppmc7xx.h @@ -234,7 +234,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 250000 #define CONFIG_SYS_FLASH_WRITE_TOUT 5000 #define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_SYS_MAX_FLASH_SECT 19 +#define CONFIG_SYS_MAX_FLASH_SECT 128 /*