[Acked/cmt] [PATCH Xenial SRU] UBUNTU: [Config] CONFIG_VM86=y, CONFIG_X86_LEGACY_VM86=y

[Andy Whitcroft]

On Mon, Apr 25, 2016 at 09:04:22AM -0600, tim.gardner at canonical.com wrote:
> From: Tim Gardner <tim.gardner at canonical.com>
> 
> BugLink: http://bugs.launchpad.net/bugs/1499089
> 
> Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
> ---
>  debian.master/config/amd64/config.common.amd64 | 1 +
>  debian.master/config/config.common.ubuntu      | 3 +--
>  debian.master/config/i386/config.common.i386   | 1 +
>  3 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> index 3f616c4..2f89bb5 100644
> --- a/debian.master/config/amd64/config.common.amd64
> +++ b/debian.master/config/amd64/config.common.amd64
> @@ -446,6 +446,7 @@ CONFIG_UWB=m
>  CONFIG_VFIO_IOMMU_TYPE1=m
>  CONFIG_VGASTATE=m
>  CONFIG_VIRTIO_MMIO=y
> +# CONFIG_VM86 is not set
>  CONFIG_VME_BUS=y
>  CONFIG_VMXNET3=m
>  CONFIG_VXFS_FS=m
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 505a3c7..b129731 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -8767,7 +8767,6 @@ CONFIG_VLAN_8021Q=m
>  CONFIG_VLAN_8021Q_GVRP=y
>  CONFIG_VLAN_8021Q_MVRP=y
>  CONFIG_VLSI_FIR=m
> -# CONFIG_VM86 is not set
>  CONFIG_VMCP=y
>  CONFIG_VME_CA91CX42=m
>  CONFIG_VME_PIO2=m
> @@ -8935,7 +8934,7 @@ CONFIG_X86_INTEL_USERCOPY=y
>  CONFIG_X86_INTERNODE_CACHE_SHIFT=6
>  CONFIG_X86_IO_APIC=y
>  CONFIG_X86_L1_CACHE_SHIFT=6
> -# CONFIG_X86_LEGACY_VM86 is not set
> +CONFIG_X86_LEGACY_VM86=y
>  CONFIG_X86_LOCAL_APIC=y
>  CONFIG_X86_LONGHAUL=m
>  CONFIG_X86_LONGRUN=m
> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> index d749ac9..df5d5f8 100644
> --- a/debian.master/config/i386/config.common.i386
> +++ b/debian.master/config/i386/config.common.i386
> @@ -441,6 +441,7 @@ CONFIG_UWB=m
>  CONFIG_VFIO_IOMMU_TYPE1=m
>  CONFIG_VGASTATE=m
>  CONFIG_VIRTIO_MMIO=y
> +CONFIG_VM86=y
>  CONFIG_VME_BUS=y
>  CONFIG_VMXNET3=m
>  CONFIG_VXFS_FS=m

Yes, this was on for Wily and seems to have been lost for Xenial.  The
reasoning is still sound, it cannot be used without changing a sysctl
explicity to allow access to page 0 therefore is low risk, and has vocal
users.

Acked-by: Andy Whitcroft <apw at canonical.com>

We do want to update the annotations to match so we need to squash in
the fragment below on application.

-apw

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 3d4a064..8e3dfaa 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -9539,7 +9539,7 @@ CONFIG_GART_IOMMU                               policy<{'amd64': 'y'}>
 CONFIG_CALGARY_IOMMU                            policy<{'amd64': 'y'}>
 CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT         policy<{'amd64': 'y'}>
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS         policy<{'amd64': 'y', 'i386': 'y'}>
-CONFIG_X86_LEGACY_VM86                          policy<{'i386': 'n'}>
+CONFIG_X86_LEGACY_VM86                          policy<{'i386': 'y'}>
 CONFIG_X86_16BIT                                policy<{'amd64': 'y', 'i386': 'y'}>
 CONFIG_X86_VSYSCALL_EMULATION                   policy<{'amd64': 'y'}>
 CONFIG_TOSHIBA                                  policy<{'i386': 'n'}>
@@ -9573,7 +9573,7 @@ CONFIG_COMPAT_VDSO                              policy<{'amd64': 'n', 'i386': 'n
 CONFIG_MODIFY_LDT_SYSCALL                       policy<{'amd64': 'y', 'i386': 'y'}>
 #
 CONFIG_COMPAT_VDSO                              mark<ENFORCED>
-CONFIG_X86_LEGACY_VM86				flag<REVIEW> note<Q: did we not just turn this back on on earlier releases?>
+CONFIG_X86_LEGACY_VM86				note<LP:1499089>
 CONFIG_KEXEC_BZIMAGE_VERIFY_SIG			flag<REVIEW> note<Q: check this is in sync with the kexec/kdump userspace>
 CONFIG_MODIFY_LDT_SYSCALL			flag<REVIEW> note<Q: check this with security>