Merge branch 'tip-x86-kaslr' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/urgent

Browse source

Pull ASLR and kASLR fixes from Borislav Petkov:

  - Add a global flag announcing KASLR state so that relevant code can do
    informed decisions based on its setting. (Jiri Kosina)

  - Fix a stack randomization entropy decrease bug. (Hector Marco-Gisbert)

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2015-02-19 12:06:04 +01:00

parent ee408b4207 4e7c22d447

commit a267b0a349

9 changed files with 69 additions and 22 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

34

arch/x86/boot/compressed/aslr.c

View file

3

arch/x86/boot/compressed/misc.c

View file

6

arch/x86/boot/compressed/misc.h

View file

3

arch/x86/include/asm/page_types.h

View file

1

arch/x86/include/uapi/asm/bootparam.h

View file

11

arch/x86/kernel/module.c

View file

22

arch/x86/kernel/setup.c

View file

6

arch/x86/mm/mmap.c

View file

5

fs/binfmt_elf.c

View file