Commit 20cc2888 authored by Kees Cook's avatar Kees Cook Committed by H. Peter Anvin

x86, boot, kaslr: Fix nuisance warning on 32-bit builds

Building 32-bit threw a warning on kASLR enabled builds:

arch/x86/boot/compressed/aslr.c: In function ‘mem_avoid_overlap’:
arch/x86/boot/compressed/aslr.c:198:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
   avoid.start = (u64)ptr;
                 ^

This fixes the warning; unsigned long should have been used here.
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Link: http://lkml.kernel.org/r/20141001183632.GA11431@www.outflux.netSigned-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent fe82dcec
...@@ -195,7 +195,7 @@ static bool mem_avoid_overlap(struct mem_vector *img) ...@@ -195,7 +195,7 @@ static bool mem_avoid_overlap(struct mem_vector *img)
while (ptr) { while (ptr) {
struct mem_vector avoid; struct mem_vector avoid;
avoid.start = (u64)ptr; avoid.start = (unsigned long)ptr;
avoid.size = sizeof(*ptr) + ptr->len; avoid.size = sizeof(*ptr) + ptr->len;
if (mem_overlaps(img, &avoid)) if (mem_overlaps(img, &avoid))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment