Messages in this thread | | | Date | Wed, 21 May 2014 14:12:49 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in arch/x86/kernel/ldt.c between commit fa81511bb0bb ("x86-64, modify_ldt: Make support for 16-bit segments a runtime option") from Linus' tree and commit 34273f41d57e ("x86, espfix: Make it possible to disable 16-bit support") from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/kernel/ldt.c index dcbbaa165bde,c37886d759cc..000000000000 --- a/arch/x86/kernel/ldt.c +++ b/arch/x86/kernel/ldt.c @@@ -231,12 -229,7 +231,7 @@@ static int write_ldt(void __user *ptr, } } - /* - * On x86-64 we do not support 16-bit segments due to - * IRET leaking the high bits of the kernel stack address. - */ - #ifdef CONFIG_X86_64 - if (!ldt_info.seg_32bit && !sysctl_ldt16) { - if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) { ++ if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit && !sysctl_ldt16) { error = -EINVAL; goto out_unlock; } [unhandled content-type:application/pgp-signature] | |