[PATCH][Disco] UBUNTU: [Config] Disable a.out support

[Tyler Hicks]

BugLink: https://launchpad.net/bugs/1818552

The a.out core dump handler is broken and will be removed in 5.1 with
upstream commit 08300f4402ab ("a.out: remove core dumping support").
Additionally, all a.out support will be deprecated in 5.1 with upstream
commit eac616557050 ("x86: Deprecate a.out support") and completely
removed in a future release.

Disable it in Ubuntu since it is risky to leave enabled and there are
likely no users that depend on it.

Signed-off-by: Tyler Hicks <tyhicks at canonical.com>
---

I've compile tested all architectures. I booted an i386 kernel to ensure that
the binfmt_aout couldn't be loaded (doesn't exist).

Tyler

 debian.master/abi/5.0.0-8.9/i386/generic.modules | 1 -
 debian.master/config/annotations                 | 5 +++--
 debian.master/config/config.common.ubuntu        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian.master/abi/5.0.0-8.9/i386/generic.modules b/debian.master/abi/5.0.0-8.9/i386/generic.modules
index a2347da9f76b..4a6ffbcc7e67 100644
--- a/debian.master/abi/5.0.0-8.9/i386/generic.modules
+++ b/debian.master/abi/5.0.0-8.9/i386/generic.modules
@@ -523,7 +523,6 @@ bh1750
 bh1770glc
 bh1780
 binder_linux
-binfmt_aout
 binfmt_misc
 block2mtd
 blocklayoutdriver
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index fd1d454ff594..8d35b703b84d 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -136,7 +136,7 @@ CONFIG_IA32_EMULATION                           policy<{'amd64': 'y'}>
 CONFIG_IA32_AOUT                                policy<{'amd64': 'n'}>
 CONFIG_X86_X32                                  policy<{'amd64': 'y'}>
 #
-CONFIG_IA32_AOUT                                note<AOUT is deprecated> mark<DEPRECATED>
+CONFIG_IA32_AOUT                                mark<ENFORCED> note<LP:#1818552>
 
 # Menu: Boot options
 CONFIG_CMDLINE                                  policy<{'arm64': '"console=ttyAMA0"', 'armhf': '""'}>
@@ -9303,11 +9303,12 @@ CONFIG_BINFMT_SCRIPT                            policy<{'amd64': 'y', 'arm64': '
 CONFIG_BINFMT_FLAT                              policy<{'armhf': 'y'}>
 CONFIG_BINFMT_ZFLAT                             policy<{'armhf': 'y'}>
 CONFIG_BINFMT_SHARED_FLAT                       policy<{'armhf': 'y'}>
-CONFIG_BINFMT_AOUT                              policy<{'i386': 'm'}>
+CONFIG_BINFMT_AOUT                              policy<{'i386': 'n'}>
 CONFIG_BINFMT_MISC                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_COREDUMP                                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 #
 CONFIG_BINFMT_SCRIPT                            mark<ENFORCED> note<required if 'init' is a shell script such as in initramfs-tools>
+CONFIG_BINFMT_AOUT                              mark<ENFORCED> note<LP:#1818552>
 
 # Menu: File systems
 CONFIG_EXT2_FS                                  policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index d34781eaa4a3..ad65d4dea74d 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1021,7 +1021,7 @@ CONFIG_BH1780=m
 CONFIG_BIG_KEYS=y
 CONFIG_BIG_LITTLE=y
 CONFIG_BINARY_PRINTF=y
-CONFIG_BINFMT_AOUT=m
+# CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_ELF_FDPIC=y
 CONFIG_BINFMT_FLAT=y
-- 
2.7.4