From: Shubhrajyoti Datta Date: Sat, 11 Jan 2020 13:14:34 +0000 (+0530) Subject: microblaze: Prevent the overflow of the start X-Git-Tag: v4.9.215~50 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=387da85c98572cc54744384ce4ffea6e5c1ee091;p=platform%2Fkernel%2Flinux-amlogic.git microblaze: Prevent the overflow of the start [ Upstream commit 061d2c1d593076424c910cb1b64ecdb5c9a6923f ] In case the start + cache size is more than the max int the start overflows. Prevent the same. Signed-off-by: Shubhrajyoti Datta Signed-off-by: Michal Simek Signed-off-by: Sasha Levin --- diff --git a/arch/microblaze/kernel/cpu/cache.c b/arch/microblaze/kernel/cpu/cache.c index 0bde47e..dcba538 100644 --- a/arch/microblaze/kernel/cpu/cache.c +++ b/arch/microblaze/kernel/cpu/cache.c @@ -92,7 +92,8 @@ static inline void __disable_dcache_nomsr(void) #define CACHE_LOOP_LIMITS(start, end, cache_line_length, cache_size) \ do { \ int align = ~(cache_line_length - 1); \ - end = min(start + cache_size, end); \ + if (start < UINT_MAX - cache_size) \ + end = min(start + cache_size, end); \ start &= align; \ } while (0)