Skip to content

Commit a6b4505

Browse files
committed
Merge tag 'execve-v5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull execve updates from Kees Cook: - Fix binfmt_flat GOT handling for riscv (Niklas Cassel) - Remove unused/broken binfmt_flat shared library and coredump code (Eric W. Biederman) * tag 'execve-v5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: binfmt_flat: Remove shared library support binfmt_flat: Drop vestiges of coredump support binfmt_flat: do not stop relocating GOT entries prematurely on riscv
2 parents dc8af1f + 70578ff commit a6b4505

9 files changed

Lines changed: 66 additions & 186 deletions

File tree

arch/arm/configs/lpc18xx_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ CONFIG_ARM_APPENDED_DTB=y
3030
# CONFIG_BLK_DEV_BSG is not set
3131
CONFIG_BINFMT_FLAT=y
3232
CONFIG_BINFMT_ZFLAT=y
33-
CONFIG_BINFMT_SHARED_FLAT=y
3433
# CONFIG_COREDUMP is not set
3534
CONFIG_NET=y
3635
CONFIG_PACKET=y

arch/arm/configs/mps2_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
2323
CONFIG_ZBOOT_ROM_TEXT=0x0
2424
CONFIG_ZBOOT_ROM_BSS=0x0
2525
CONFIG_BINFMT_FLAT=y
26-
CONFIG_BINFMT_SHARED_FLAT=y
2726
# CONFIG_COREDUMP is not set
2827
# CONFIG_SUSPEND is not set
2928
CONFIG_NET=y

arch/arm/configs/stm32_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ CONFIG_ZBOOT_ROM_BSS=0x0
2828
CONFIG_XIP_KERNEL=y
2929
CONFIG_XIP_PHYS_ADDR=0x08008000
3030
CONFIG_BINFMT_FLAT=y
31-
CONFIG_BINFMT_SHARED_FLAT=y
3231
# CONFIG_COREDUMP is not set
3332
CONFIG_DEVTMPFS=y
3433
CONFIG_DEVTMPFS_MOUNT=y

arch/arm/configs/vf610m4_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ CONFIG_XIP_KERNEL=y
1818
CONFIG_XIP_PHYS_ADDR=0x0f000080
1919
CONFIG_BINFMT_FLAT=y
2020
CONFIG_BINFMT_ZFLAT=y
21-
CONFIG_BINFMT_SHARED_FLAT=y
2221
# CONFIG_SUSPEND is not set
2322
# CONFIG_UEVENT_HELPER is not set
2423
# CONFIG_STANDALONE is not set

arch/sh/configs/rsk7201_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ CONFIG_CMDLINE_OVERWRITE=y
2525
CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ignore_loglevel"
2626
CONFIG_BINFMT_FLAT=y
2727
CONFIG_BINFMT_ZFLAT=y
28-
CONFIG_BINFMT_SHARED_FLAT=y
2928
CONFIG_PM=y
3029
CONFIG_CPU_IDLE=y
3130
# CONFIG_STANDALONE is not set

arch/sh/configs/rsk7203_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ CONFIG_CMDLINE_OVERWRITE=y
3030
CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ignore_loglevel"
3131
CONFIG_BINFMT_FLAT=y
3232
CONFIG_BINFMT_ZFLAT=y
33-
CONFIG_BINFMT_SHARED_FLAT=y
3433
CONFIG_PM=y
3534
CONFIG_CPU_IDLE=y
3635
CONFIG_NET=y

arch/sh/configs/se7206_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ CONFIG_CMDLINE_OVERWRITE=y
4040
CONFIG_CMDLINE="console=ttySC3,115200 ignore_loglevel earlyprintk=serial"
4141
CONFIG_BINFMT_FLAT=y
4242
CONFIG_BINFMT_ZFLAT=y
43-
CONFIG_BINFMT_SHARED_FLAT=y
4443
CONFIG_BINFMT_MISC=y
4544
CONFIG_NET=y
4645
CONFIG_PACKET=y

fs/Kconfig.binfmt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,6 @@ config BINFMT_ZFLAT
142142
help
143143
Support FLAT format compressed binaries
144144

145-
config BINFMT_SHARED_FLAT
146-
bool "Enable shared FLAT support"
147-
depends on BINFMT_FLAT
148-
help
149-
Support FLAT shared libraries
150-
151145
config HAVE_AOUT
152146
def_bool n
153147

0 commit comments

Comments
 (0)