diff options
| author | mspector <mspector@google.com> | 2017-02-07 13:24:21 -0800 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-13 12:35:13 +0200 |
| commit | 237290a5c9ce274457646ca98abe380dd0b57190 (patch) | |
| tree | bc68cec18fdeda409e9e3465e58cad0b07d4e5af /fs/binfmt_elf.c | |
| parent | 8433efcc876aab9c0f2495d8d5a288c2e99b4308 (diff) | |
ANDROID: Put KUSER_HELPERS disable behind config
This change puts the KUSER_HELPERS selective disable behind the KCONFIG
KUSER_HELPERS_SELECTIVE_DISABLE.
Original patch adding KUSER_HELPERS:
2bed8acb3c3d44c66d979fed9bdd4ea69cb8650b
I8d6d75cc8e1b2280f2436fd3334ff3779ae3539a
Signed-off-by: mspector <mspector@google.com>
Change-Id: I54c606f1f39823abf0a754eef69569cbfb63f8af
Bug: 34815073
Diffstat (limited to 'fs/binfmt_elf.c')
| -rw-r--r-- | fs/binfmt_elf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index cd843472f..baad3aaee 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -567,8 +567,8 @@ static unsigned long randomize_stack_top(unsigned long stack_top) #endif } -#ifdef CONFIG_ARM64 -#define ANDROID_NOTE_OWNER "Android" +#ifdef CONFIG_KUSER_HELPERS_SELECTIVE_DISABLE +#define ANDROID_NOTE_OWNER"Android" #define ANDROID_KUSER_HELPER_TYPE 0x3L #define ANDROID_KUSER_HELPER_ON 0x1L @@ -1035,7 +1035,7 @@ static int load_elf_binary(struct linux_binprm *bprm) set_binfmt(&elf_format); #ifdef ARCH_HAS_SETUP_ADDITIONAL_PAGES -#ifdef CONFIG_ARM64 +#ifdef CONFIG_KUSER_HELPERS_SELECTIVE_DISABLE retval = should_call_arch_setup_additional_pages(bprm, &loc->elf_ex, elf_phdata); if (retval < 0) @@ -1048,7 +1048,7 @@ static int load_elf_binary(struct linux_binprm *bprm) send_sig(SIGKILL, current, 0); goto out; } -#ifdef CONFIG_ARM64 +#ifdef CONFIG_KUSER_HELPERS_SELECTIVE_DISABLE } #endif #endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */ |