Revert "linux: Disable LSM for /dev/io port access"

This reverts commit 5b966f1b0a0f191c7d79b1609c122c16a65d3bfc.

diff --git a/lfs/linux b/lfs/linux
index 0deef74f2696ab3282064907c9d100a55a21ba14..91bba123bfdcd1d56fc172074a7db2965edf5922 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -143,9 +143,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # https://bugzilla.ipfire.org/show_bug.cgi?id=12760
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.15-NFQUEUE-Hold-RCU-read-lock-while-calling-nf_reinject.patch
 
-       # Unfortunately, /dev/io access is needed for firmware flashing; patch out LSM part in ioport.c
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.15.32-disable_lsm_for_ioport_access.patch
-
 ifeq "$(BUILD_ARCH)" "armv6l"
        # Apply Arm-multiarch kernel patches.
        cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1

diff --git a/src/patches/linux/linux-5.15.32-disable_lsm_for_ioport_access.patch b/src/patches/linux/linux-5.15.32-disable_lsm_for_ioport_access.patch
deleted file mode 100644 (file)
index df7521d..0000000
--- a/src/patches/linux/linux-5.15.32-disable_lsm_for_ioport_access.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- linux-5.15.32.orig/arch/x86/kernel/ioport.c        2022-04-19 12:54:46.468477540 +0000
-+++ linux-5.15.32/arch/x86/kernel/ioport.c     2022-04-19 12:56:21.423185714 +0000
-@@ -4,7 +4,6 @@
-  * by Linus. 32/64 bits code unification by Miguel Botón.
-  */
- #include <linux/capability.h>
--#include <linux/security.h>
- #include <linux/syscalls.h>
- #include <linux/bitmap.h>
- #include <linux/ioport.h>
-@@ -70,8 +69,7 @@
- 
-       if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
-               return -EINVAL;
--      if (turn_on && (!capable(CAP_SYS_RAWIO) ||
--                      security_locked_down(LOCKDOWN_IOPORT)))
-+      if (turn_on && (!capable(CAP_SYS_RAWIO)))
-               return -EPERM;
- 
-       /*
-@@ -186,8 +184,7 @@
- 
-       /* Trying to gain more privileges? */
-       if (level > old) {
--              if (!capable(CAP_SYS_RAWIO) ||
--                  security_locked_down(LOCKDOWN_IOPORT))
-+              if (!capable(CAP_SYS_RAWIO))
-                       return -EPERM;
-       }
-