diff options
| author | Kees Cook | 2014-10-01 20:36:32 +0200 |
|---|---|---|
| committer | H. Peter Anvin | 2014-10-01 20:41:24 +0200 |
| commit | 20cc28882bf4a8c9a2605a9a76a7952e696aaece (patch) | |
| tree | 277cee1b9952b434b3bcbe6c84b7b4527d0a96ae /arch/x86/boot | |
| parent | Linux 3.17-rc7 (diff) | |
| download | kernel-qcow2-linux-20cc28882bf4a8c9a2605a9a76a7952e696aaece.tar.gz kernel-qcow2-linux-20cc28882bf4a8c9a2605a9a76a7952e696aaece.tar.xz kernel-qcow2-linux-20cc28882bf4a8c9a2605a9a76a7952e696aaece.zip | |
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: Kees Cook <keescook@chromium.org>
Link: http://lkml.kernel.org/r/20141001183632.GA11431@www.outflux.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/compressed/aslr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/aslr.c b/arch/x86/boot/compressed/aslr.c index d39189ba7f8e..f302dc45ce08 100644 --- a/arch/x86/boot/compressed/aslr.c +++ b/arch/x86/boot/compressed/aslr.c @@ -195,7 +195,7 @@ static bool mem_avoid_overlap(struct mem_vector *img) while (ptr) { struct mem_vector avoid; - avoid.start = (u64)ptr; + avoid.start = (unsigned long)ptr; avoid.size = sizeof(*ptr) + ptr->len; if (mem_overlaps(img, &avoid)) |