x86/KASLR: Parse all 'memmap=' boot option entries
authorBaoquan He <bhe@redhat.com>
Sat, 13 May 2017 05:46:28 +0000 (13:46 +0800)
committerIngo Molnar <mingo@kernel.org>
Wed, 24 May 2017 07:50:27 +0000 (09:50 +0200)
commitd52e7d5a952c5e35783f96e8c5b7fcffbb0d7c60
tree4c8b6c1df9e5032f71a9f79b1f573774f690d766
parent56fff1bb0f31358bf81a3c64a8dcd6da0dc44263
x86/KASLR: Parse all 'memmap=' boot option entries

In commit:

  f28442497b5c ("x86/boot: Fix KASLR and memmap= collision")

... the memmap= option is parsed so that KASLR can avoid those reserved
regions. It uses cmdline_find_option() to get the value if memmap=
is specified, however the problem is that cmdline_find_option() can only
find the last entry if multiple memmap entries are provided. This
is not correct.

Address this by checking each command line token for a "memmap=" match
and parse each instance instead of using cmdline_find_option().

Signed-off-by: Baoquan He <bhe@redhat.com>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: dan.j.williams@intel.com
Cc: douly.fnst@cn.fujitsu.com
Cc: dyoung@redhat.com
Cc: m.mizuma@jp.fujitsu.com
Link: http://lkml.kernel.org/r/1494654390-23861-2-git-send-email-bhe@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/boot/compressed/cmdline.c
arch/x86/boot/compressed/kaslr.c
arch/x86/boot/string.c