UBUNTU: [Config] Disable a.out support

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@canonical.com>
Acked-by: Colin Ian King <colin.king@canonical.com>
Acked-By: You-Sheng Yang <vicamo.yang@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/debian.master/abi/4.15.0-50.54/i386/generic.modules b/debian.master/abi/4.15.0-50.54/i386/generic.modules
index 98f9af2471ce7e25d8bea3bd3844725965f4eb26..ffbab12da3ade52b932aabbf49ca33f0696752c9 100644 (file)
--- a/debian.master/abi/4.15.0-50.54/i386/generic.modules
+++ b/debian.master/abi/4.15.0-50.54/i386/generic.modules
@@ -513,7 +513,6 @@ bfusb
 bh1750
 bh1770glc
 bh1780
-binfmt_aout
 binfmt_misc
 block2mtd
 blocklayoutdriver

diff --git a/debian.master/abi/4.15.0-50.54/i386/lowlatency.modules b/debian.master/abi/4.15.0-50.54/i386/lowlatency.modules
index 447186b97c4fcf707e5da546369b7ce453acd77f..354d1c1ff703f485b0e1c7a8390827c03e5b48a0 100644 (file)
--- a/debian.master/abi/4.15.0-50.54/i386/lowlatency.modules
+++ b/debian.master/abi/4.15.0-50.54/i386/lowlatency.modules
@@ -513,7 +513,6 @@ bfusb
 bh1750
 bh1770glc
 bh1780
-binfmt_aout
 binfmt_misc
 block2mtd
 blocklayoutdriver

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 69a7595fcb8b1343aec2e37b8c9954cfd9240026..ce6eb7e43b9209f2e22015277c7fca0b99be6ad3 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8706,13 +8706,14 @@ 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_SECCOMP                                  policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_COMPAT                                   policy<{'amd64': 'y', 'arm64': '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>
 CONFIG_SECCOMP                                  mark<ENFORCED>
 
 # Menu: Executable file formats / Emulations >> Architecture: arm
@@ -8726,7 +8727,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: 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 15d6c44fb7600d2110a76246279264b073671ba7..d6f872015628333bf8ebf98165b57649338d1ce2 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -963,7 +963,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