diff options
| author | Linus Torvalds | 2017-08-26 18:06:28 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2017-08-26 18:06:28 +0200 |
| commit | c153e62105c3124d7aee0a1fa563df8b8e995078 (patch) | |
| tree | 432e2df9b427863f9d0e3f12e175f6f6aeab4656 /arch/x86/include | |
| parent | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | x86/mm: Fix use-after-free of ldt_struct (diff) | |
| download | kernel-qcow2-linux-c153e62105c3124d7aee0a1fa563df8b8e995078.tar.gz kernel-qcow2-linux-c153e62105c3124d7aee0a1fa563df8b8e995078.tar.xz kernel-qcow2-linux-c153e62105c3124d7aee0a1fa563df8b8e995078.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Two fixes: one for an ldt_struct handling bug and a cherry-picked
objtool fix"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mm: Fix use-after-free of ldt_struct
objtool: Fix '-mtune=atom' decoding support in objtool 2.0
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/mmu_context.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h index 265c907d7d4c..7a234be7e298 100644 --- a/arch/x86/include/asm/mmu_context.h +++ b/arch/x86/include/asm/mmu_context.h @@ -140,9 +140,7 @@ static inline int init_new_context(struct task_struct *tsk, mm->context.execute_only_pkey = -1; } #endif - init_new_context_ldt(tsk, mm); - - return 0; + return init_new_context_ldt(tsk, mm); } static inline void destroy_context(struct mm_struct *mm) { |