@@ -678,7 +678,6 @@ CONFIG_VFIO_PCI=y
CONFIG_VFIO_PCI_CORE=y
CONFIG_VFIO_VIRQFD=y
CONFIG_VIRTIO_MMIO=y
-CONFIG_VMAP_STACK=y
CONFIG_VME_BUS=y
CONFIG_VMXNET3=m
CONFIG_VXFS_FS=m
@@ -11167,7 +11167,7 @@ CONFIG_STACKPROTECTOR_STRONG policy<{'amd64': 'y', 'arm64': '
CONFIG_ARCH_MMAP_RND_BITS policy<{'amd64': '28', 'arm64': '18', 'armhf': '8', 'ppc64el': '28', 'riscv64': '18'}>
CONFIG_ARCH_MMAP_RND_COMPAT_BITS policy<{'amd64': '8', 'arm64': '11', 'ppc64el': '8'}>
CONFIG_COMPAT_32BIT_TIME policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
-CONFIG_VMAP_STACK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'riscv64': 'n', 's390x': 'y'}>
+CONFIG_VMAP_STACK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'riscv64': 'y', 's390x': 'y'}>
CONFIG_RANDOMIZE_KSTACK_OFFSET policy<{'amd64': 'y', 'arm64': 'y', 's390x': 'y'}>
CONFIG_STRICT_KERNEL_RWX policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
CONFIG_STRICT_MODULE_RWX policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
@@ -710,7 +710,6 @@ CONFIG_VFIO_PCI_CORE=m
CONFIG_VFIO_VIRQFD=m
CONFIG_VIDEO_TI_CAL_MC=y
CONFIG_VIRTIO_MMIO=y
-CONFIG_VMAP_STACK=y
CONFIG_VME_BUS=y
CONFIG_VMXNET3=m
CONFIG_VXFS_FS=m
@@ -691,7 +691,6 @@ CONFIG_VFIO_PCI=m
CONFIG_VFIO_PCI_CORE=m
CONFIG_VFIO_VIRQFD=m
CONFIG_VIRTIO_MMIO=y
-CONFIG_VMAP_STACK=y
CONFIG_VME_BUS=y
CONFIG_VMXNET3=m
CONFIG_VXFS_FS=m
@@ -12848,6 +12848,7 @@ CONFIG_VLAN_8021Q=m
CONFIG_VLAN_8021Q_GVRP=y
CONFIG_VLAN_8021Q_MVRP=y
CONFIG_VMAP_PFN=y
+CONFIG_VMAP_STACK=y
CONFIG_VMCP=y
CONFIG_VMCP_CMA_SIZE=4
CONFIG_VMD=m
@@ -673,7 +673,6 @@ CONFIG_VFIO_PCI=m
CONFIG_VFIO_PCI_CORE=m
CONFIG_VFIO_VIRQFD=m
CONFIG_VIRTIO_MMIO=y
-# CONFIG_VMAP_STACK is not set
CONFIG_VME_BUS=y
CONFIG_VMXNET3=m
CONFIG_VXFS_FS=m
@@ -604,7 +604,6 @@ CONFIG_VFIO_PCI_CORE=m
CONFIG_VFIO_VIRQFD=m
# CONFIG_VIRTIO_MMIO is not set
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
-CONFIG_VMAP_STACK=y
# CONFIG_VME_BUS is not set
# CONFIG_VMXNET3 is not set
# CONFIG_VXFS_FS is not set
BugLink: https://bugs.launchpad.net/bugs/1981437 Enable virtually-mapped kernel stacks like all other architectures. This creates guard pages which will cause kernel stack overflows to be caught immediately. Signed-off-by: Emil Renner Berthing <emil.renner.berthing@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/annotations | 2 +- debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/armhf/config.common.armhf | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/riscv64/config.common.riscv64 | 1 - debian.master/config/s390x/config.common.s390x | 1 - 7 files changed, 2 insertions(+), 6 deletions(-)