diff options
| author | Wang Long <long.wanglong@huawei.com> | 2015-11-05 18:51:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 19:34:48 -0800 |
| commit | e0d57714394f5e2ce4e2f9bbebf48e3c7a7fd3be (patch) | |
| tree | 2da40842cee7132a446b023d49f51dabed0bc534 /mm/kasan/kasan.c | |
| parent | f523e737c08f5daaec9fac017e1bc5695e6f2760 (diff) | |
| download | linux-e0d57714394f5e2ce4e2f9bbebf48e3c7a7fd3be.tar.gz linux-e0d57714394f5e2ce4e2f9bbebf48e3c7a7fd3be.tar.xz | |
kasan: Fix a type conversion error
The current KASAN code can not find the following out-of-bounds bugs:
char *ptr;
ptr = kmalloc(8, GFP_KERNEL);
memset(ptr+7, 0, 2);
the cause of the problem is the type conversion error in
*memory_is_poisoned_n* function. So this patch fix that.
Signed-off-by: Wang Long <long.wanglong@huawei.com>
Acked-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/kasan/kasan.c')
| -rw-r--r-- | mm/kasan/kasan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c index 21c50dcbc9f0..2b21ccd55cd4 100644 --- a/mm/kasan/kasan.c +++ b/mm/kasan/kasan.c @@ -203,7 +203,7 @@ static __always_inline bool memory_is_poisoned_n(unsigned long addr, s8 *last_shadow = (s8 *)kasan_mem_to_shadow((void *)last_byte); if (unlikely(ret != (unsigned long)last_shadow || - ((last_byte & KASAN_SHADOW_MASK) >= *last_shadow))) + ((long)(last_byte & KASAN_SHADOW_MASK) >= *last_shadow))) return true; } return false; |