From f74de33c69c79b4a620a29d76c85172f26cd3afe Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 5 Feb 2020 06:43:26 -0600 Subject: Linux v5.5.2 --- kernel.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel.spec b/kernel.spec index 1716bb1e0..d859e2851 100644 --- a/kernel.spec +++ b/kernel.spec @@ -89,7 +89,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 1 +%define stable_update 2 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -2888,6 +2888,9 @@ fi # # %changelog +* Wed Feb 05 2020 Justin M. Forbes - 5.5.2-200 +- Linux v5.5.2 + * Sun Feb 02 2020 Peter Robinson - 5.5.1-200 - Linux v5.5.1 diff --git a/sources b/sources index 4e428edaa..f5d5bcbef 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-5.5.tar.xz) = fa74fdabb5e63384a39e54da05b86a9ae9ea16179524b041fbbdffc7177e80b53600ae98d76be127ba216148f9dc55fe07ab20637e22c6d6030cb4aa09eb2f86 -SHA512 (patch-5.5.1.xz) = beef937378945a577a7172f5b322e888c5f36156dfa82ef28e50ee3f5347ca190e8281e6c86fb50a607ceee2155f567e20b9a2a908a41efaf50616fc3c083041 +SHA512 (patch-5.5.2.xz) = 9a59336db4f60c8944498435e53af5c9267dc155cbf419c0a99df3fff3d6d4c527561b46f600ca61fe199124fffdb9f6b868a2ac8acd1dff7d123ab8e75fa7b6 -- cgit From 9a754bda52838c8c3e538d7bb4525fa49373923a Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 6 Feb 2020 11:04:17 -0600 Subject: Temporary build fix for test week --- configs/fedora/generic/arm/armv7/CONFIG_DEBUG_INFO_BTF | 1 + kernel-armv7hl-debug-fedora.config | 2 +- kernel-armv7hl-fedora.config | 2 +- kernel-armv7hl-lpae-debug-fedora.config | 2 +- kernel-armv7hl-lpae-fedora.config | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 configs/fedora/generic/arm/armv7/CONFIG_DEBUG_INFO_BTF diff --git a/configs/fedora/generic/arm/armv7/CONFIG_DEBUG_INFO_BTF b/configs/fedora/generic/arm/armv7/CONFIG_DEBUG_INFO_BTF new file mode 100644 index 000000000..3b5ac748f --- /dev/null +++ b/configs/fedora/generic/arm/armv7/CONFIG_DEBUG_INFO_BTF @@ -0,0 +1 @@ +# CONFIG_DEBUG_INFO_BTF is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index e1e621c5f..a650f9cc7 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1302,7 +1302,7 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set -CONFIG_DEBUG_INFO_BTF=y +# CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 9f73cf01b..8ae09b1f6 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1302,7 +1302,7 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set -CONFIG_DEBUG_INFO_BTF=y +# CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 226f63be3..3de05c76b 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1270,7 +1270,7 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set -CONFIG_DEBUG_INFO_BTF=y +# CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index a37946c7c..77c591807 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1270,7 +1270,7 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set -CONFIG_DEBUG_INFO_BTF=y +# CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set -- cgit From 4d40f2e8cbe0fd36c2319d8ab5eb876dd46c4393 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Fri, 7 Feb 2020 13:21:02 -0500 Subject: Enable PCI Express devices on RockChip SoCs (rhbz 1792564) --- configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST | 1 + configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE | 1 + kernel-aarch64-debug-fedora.config | 4 ++-- kernel-aarch64-fedora.config | 4 ++-- kernel.spec | 3 +++ 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST b/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST new file mode 100644 index 000000000..416bd56df --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST @@ -0,0 +1 @@ +CONFIG_PCIE_ROCKCHIP_HOST=m diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE new file mode 100644 index 000000000..20fb6074b --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE @@ -0,0 +1 @@ +CONFIG_PHY_ROCKCHIP_PCIE=m diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index c681f3f10..94828f38a 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -4479,7 +4479,7 @@ CONFIG_PCIE_KIRIN=y CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCIE_QCOM=y -# CONFIG_PCIE_ROCKCHIP_HOST is not set +CONFIG_PCIE_ROCKCHIP_HOST=m CONFIG_PCIE_TEGRA194=m CONFIG_PCIE_XILINX_NWL=y CONFIG_PCIE_XILINX=y @@ -4576,7 +4576,7 @@ CONFIG_PHY_ROCKCHIP_EMMC=m CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m CONFIG_PHY_ROCKCHIP_INNO_HDMI=m CONFIG_PHY_ROCKCHIP_INNO_USB2=m -# CONFIG_PHY_ROCKCHIP_PCIE is not set +CONFIG_PHY_ROCKCHIP_PCIE=m CONFIG_PHY_ROCKCHIP_TYPEC=m CONFIG_PHY_ROCKCHIP_USB=m # CONFIG_PHY_SAMSUNG_USB2 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index e2bc69d20..c4a36e8ec 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -4459,7 +4459,7 @@ CONFIG_PCIE_KIRIN=y CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCIE_QCOM=y -# CONFIG_PCIE_ROCKCHIP_HOST is not set +CONFIG_PCIE_ROCKCHIP_HOST=m CONFIG_PCIE_TEGRA194=m CONFIG_PCIE_XILINX_NWL=y CONFIG_PCIE_XILINX=y @@ -4556,7 +4556,7 @@ CONFIG_PHY_ROCKCHIP_EMMC=m CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m CONFIG_PHY_ROCKCHIP_INNO_HDMI=m CONFIG_PHY_ROCKCHIP_INNO_USB2=m -# CONFIG_PHY_ROCKCHIP_PCIE is not set +CONFIG_PHY_ROCKCHIP_PCIE=m CONFIG_PHY_ROCKCHIP_TYPEC=m CONFIG_PHY_ROCKCHIP_USB=m # CONFIG_PHY_SAMSUNG_USB2 is not set diff --git a/kernel.spec b/kernel.spec index d859e2851..f0dfbd342 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2888,6 +2888,9 @@ fi # # %changelog +* Fri Feb 07 2020 Jeremy Cline +- Enable PCI Express devices on RockChip SoCs (rhbz 1792564) + * Wed Feb 05 2020 Justin M. Forbes - 5.5.2-200 - Linux v5.5.2 -- cgit From eac0fe7365a83a39f8133be558064ef3820012c2 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 10 Feb 2020 12:53:18 -0500 Subject: Remove sysrq support to lift lockdown (rhbz 1800859) --- .../generic/CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ | 1 - kernel-aarch64-debug-fedora.config | 1 - kernel-aarch64-fedora.config | 1 - kernel-armv7hl-debug-fedora.config | 1 - kernel-armv7hl-fedora.config | 1 - kernel-armv7hl-lpae-debug-fedora.config | 1 - kernel-armv7hl-lpae-fedora.config | 1 - kernel-i686-debug-fedora.config | 1 - kernel-i686-fedora.config | 1 - kernel-ppc64le-debug-fedora.config | 1 - kernel-ppc64le-fedora.config | 1 - kernel-s390x-debug-fedora.config | 1 - kernel-s390x-fedora.config | 1 - kernel-x86_64-debug-fedora.config | 1 - kernel-x86_64-fedora.config | 1 - kernel.spec | 5 +- lift-lockdown-sysrq.patch | 287 --------------------- 17 files changed, 3 insertions(+), 304 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ delete mode 100644 lift-lockdown-sysrq.patch diff --git a/configs/fedora/generic/CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ b/configs/fedora/generic/CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ deleted file mode 100644 index 40a287f0f..000000000 --- a/configs/fedora/generic/CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ +++ /dev/null @@ -1 +0,0 @@ -CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 94828f38a..8a897011f 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -188,7 +188,6 @@ CONFIG_AK8975=m CONFIG_AL_FIC=y CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m -CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_FREEZE_BRIDGE is not set # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index c4a36e8ec..bc6d67fb3 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -188,7 +188,6 @@ CONFIG_AK8975=m CONFIG_AL_FIC=y CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m -CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_FREEZE_BRIDGE is not set # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index a650f9cc7..76d39eeab 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -161,7 +161,6 @@ CONFIG_AK8975=m # CONFIG_AL_FIC is not set CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m -CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_FREEZE_BRIDGE is not set # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 8ae09b1f6..d6f59bf7f 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -161,7 +161,6 @@ CONFIG_AK8975=m # CONFIG_AL_FIC is not set CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m -CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_FREEZE_BRIDGE is not set # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 3de05c76b..28225d806 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -160,7 +160,6 @@ CONFIG_AK8975=m # CONFIG_AL_FIC is not set CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m -CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_FREEZE_BRIDGE is not set # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 77c591807..73bb515c0 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -160,7 +160,6 @@ CONFIG_AK8975=m # CONFIG_AL_FIC is not set CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m -CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_FREEZE_BRIDGE is not set # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 042328859..8c6ee7059 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -202,7 +202,6 @@ CONFIG_ALIENWARE_WMI=m CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m # CONFIG_ALIX is not set -CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_FREEZE_BRIDGE is not set # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 17df9d882..aea0f7210 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -202,7 +202,6 @@ CONFIG_ALIENWARE_WMI=m CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m # CONFIG_ALIX is not set -CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_FREEZE_BRIDGE is not set # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 3b2aac398..fffc610e9 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -154,7 +154,6 @@ CONFIG_AIX_PARTITION=y # CONFIG_AL_FIC is not set CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m -CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_FREEZE_BRIDGE is not set # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 6e393a711..8af4a2b3d 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -154,7 +154,6 @@ CONFIG_AIX_PARTITION=y # CONFIG_AL_FIC is not set CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m -CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_FREEZE_BRIDGE is not set # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index f4ef8e9a7..cb7b54839 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -154,7 +154,6 @@ CONFIG_AIX_PARTITION=y # CONFIG_AL_FIC is not set CONFIG_ALIM1535_WDT=m # CONFIG_ALIM7101_WDT is not set -CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_FREEZE_BRIDGE is not set # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 35de780b8..2b96ce67c 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -154,7 +154,6 @@ CONFIG_AIX_PARTITION=y # CONFIG_AL_FIC is not set CONFIG_ALIM1535_WDT=m # CONFIG_ALIM7101_WDT is not set -CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_FREEZE_BRIDGE is not set # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index f820243ec..bd0967a1c 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -205,7 +205,6 @@ CONFIG_AK8975=m CONFIG_ALIENWARE_WMI=m CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m -CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_FREEZE_BRIDGE is not set # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 775e76815..e84c5b4c0 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -205,7 +205,6 @@ CONFIG_AK8975=m CONFIG_ALIENWARE_WMI=m CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m -CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_FREEZE_BRIDGE is not set # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m diff --git a/kernel.spec b/kernel.spec index f0dfbd342..acfac4d88 100644 --- a/kernel.spec +++ b/kernel.spec @@ -800,8 +800,6 @@ Patch202: 0003-Make-get_cert_list-use-efi_status_to_str-to-print-er.patch Patch204: efi-secureboot.patch -Patch205: lift-lockdown-sysrq.patch - Patch206: s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch # 300 - ARM patches @@ -2888,6 +2886,9 @@ fi # # %changelog +* Mon Feb 10 2020 Jeremy Cline +- Remove sysrq support to lift lockdown (rhbz 1800859) + * Fri Feb 07 2020 Jeremy Cline - Enable PCI Express devices on RockChip SoCs (rhbz 1792564) diff --git a/lift-lockdown-sysrq.patch b/lift-lockdown-sysrq.patch deleted file mode 100644 index b465143fb..000000000 --- a/lift-lockdown-sysrq.patch +++ /dev/null @@ -1,287 +0,0 @@ -From c2eb371cede78df9a47bf3a125aa9a45dd833da7 Mon Sep 17 00:00:00 2001 -From: Kyle McMartin -Date: Mon, 9 Apr 2018 09:52:45 +0100 -Subject: [PATCH] Add a SysRq option to lift kernel lockdown - -Make an option to provide a sysrq key that will lift the kernel lockdown, -thereby allowing the running kernel image to be accessed and modified. - -On x86 this is triggered with SysRq+x, but this key may not be available on -all arches, so it is set by setting LOCKDOWN_LIFT_KEY in asm/setup.h. -Since this macro must be defined in an arch to be able to use this facility -for that arch, the Kconfig option is restricted to arches that support it. - -Signed-off-by: Kyle McMartin -Signed-off-by: David Howells -cc: x86@kernel.org -Signed-off-by: Jeremy Cline ---- - arch/x86/include/asm/setup.h | 2 ++ - drivers/input/misc/uinput.c | 1 + - drivers/tty/sysrq.c | 27 +++++++++++++--------- - include/linux/input.h | 5 +++++ - include/linux/sysrq.h | 8 ++++++- - kernel/debug/kdb/kdb_main.c | 2 +- - security/lockdown/Kconfig | 11 +++++++++ - security/lockdown/lockdown.c | 43 ++++++++++++++++++++++++++++++++++++ - 8 files changed, 87 insertions(+), 12 deletions(-) - -diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h -index ed8ec011a9fd..8daf633a5347 100644 ---- a/arch/x86/include/asm/setup.h -+++ b/arch/x86/include/asm/setup.h -@@ -9,6 +9,8 @@ - #include - #include - -+#define LOCKDOWN_LIFT_KEY 'x' -+ - #ifdef __i386__ - - #include -diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c -index 84051f20b18a..583ab2bc1916 100644 ---- a/drivers/input/misc/uinput.c -+++ b/drivers/input/misc/uinput.c -@@ -353,6 +353,7 @@ static int uinput_create_device(struct uinput_device *udev) - dev->flush = uinput_dev_flush; - } - -+ dev->flags |= INPUTDEV_FLAGS_SYNTHETIC; - dev->event = uinput_dev_event; - - input_set_drvdata(udev->dev, udev); -diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c -index 573b2055173c..99082faafc44 100644 ---- a/drivers/tty/sysrq.c -+++ b/drivers/tty/sysrq.c -@@ -480,6 +480,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = { - /* x: May be registered on mips for TLB dump */ - /* x: May be registered on ppc/powerpc for xmon */ - /* x: May be registered on sparc64 for global PMU dump */ -+ /* x: May be registered on x86_64 for disabling secure boot */ - NULL, /* x */ - /* y: May be registered on sparc64 for global register dump */ - NULL, /* y */ -@@ -523,7 +524,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p) - sysrq_key_table[i] = op_p; - } - --void __handle_sysrq(int key, bool check_mask) -+void __handle_sysrq(int key, unsigned int from) - { - struct sysrq_key_op *op_p; - int orig_log_level; -@@ -546,11 +547,15 @@ void __handle_sysrq(int key, bool check_mask) - - op_p = __sysrq_get_key_op(key); - if (op_p) { -- /* -- * Should we check for enabled operations (/proc/sysrq-trigger -- * should not) and is the invoked operation enabled? -- */ -- if (!check_mask || sysrq_on_mask(op_p->enable_mask)) { -+ /* Ban synthetic events from some sysrq functionality */ -+ if ((from == SYSRQ_FROM_PROC || from == SYSRQ_FROM_SYNTHETIC) && -+ op_p->enable_mask & SYSRQ_DISABLE_USERSPACE) { -+ printk("This sysrq operation is disabled from userspace.\n"); -+ } else if (from == SYSRQ_FROM_KERNEL || sysrq_on_mask(op_p->enable_mask)) { -+ /* -+ * Should we check for enabled operations (/proc/sysrq-trigger -+ * should not) and is the invoked operation enabled? -+ */ - pr_info("%s\n", op_p->action_msg); - console_loglevel = orig_log_level; - op_p->handler(key); -@@ -585,7 +590,7 @@ void __handle_sysrq(int key, bool check_mask) - void handle_sysrq(int key) - { - if (sysrq_on()) -- __handle_sysrq(key, true); -+ __handle_sysrq(key, SYSRQ_FROM_KERNEL); - } - EXPORT_SYMBOL(handle_sysrq); - -@@ -665,7 +670,7 @@ static void sysrq_do_reset(struct timer_list *t) - static void sysrq_handle_reset_request(struct sysrq_state *state) - { - if (state->reset_requested) -- __handle_sysrq(sysrq_xlate[KEY_B], false); -+ __handle_sysrq(sysrq_xlate[KEY_B], SYSRQ_FROM_KERNEL); - - if (sysrq_reset_downtime_ms) - mod_timer(&state->keyreset_timer, -@@ -818,8 +823,10 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq, - - default: - if (sysrq->active && value && value != 2) { -+ int from = sysrq->handle.dev->flags & INPUTDEV_FLAGS_SYNTHETIC ? -+ SYSRQ_FROM_SYNTHETIC : 0; - sysrq->need_reinject = false; -- __handle_sysrq(sysrq_xlate[code], true); -+ __handle_sysrq(sysrq_xlate[code], from); - } - break; - } -@@ -1102,7 +1109,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf, - - if (get_user(c, buf)) - return -EFAULT; -- __handle_sysrq(c, false); -+ __handle_sysrq(c, SYSRQ_FROM_PROC); - } - - return count; -diff --git a/include/linux/input.h b/include/linux/input.h -index 94f277cd806a..8539afa2c001 100644 ---- a/include/linux/input.h -+++ b/include/linux/input.h -@@ -48,6 +48,7 @@ enum input_clock_type { - * @phys: physical path to the device in the system hierarchy - * @uniq: unique identification code for the device (if device has it) - * @id: id of the device (struct input_id) -+ * @flags: input device flags (SYNTHETIC, etc.) - * @propbit: bitmap of device properties and quirks - * @evbit: bitmap of types of events supported by the device (EV_KEY, - * EV_REL, etc.) -@@ -134,6 +135,8 @@ struct input_dev { - const char *uniq; - struct input_id id; - -+ unsigned int flags; -+ - unsigned long propbit[BITS_TO_LONGS(INPUT_PROP_CNT)]; - - unsigned long evbit[BITS_TO_LONGS(EV_CNT)]; -@@ -204,6 +207,8 @@ struct input_dev { - }; - #define to_input_dev(d) container_of(d, struct input_dev, dev) - -+#define INPUTDEV_FLAGS_SYNTHETIC 0x000000001 -+ - /* - * Verify that we are in sync with input_device_id mod_devicetable.h #defines - */ -diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h -index 8c71874e8485..7de1f08b60a9 100644 ---- a/include/linux/sysrq.h -+++ b/include/linux/sysrq.h -@@ -29,6 +29,8 @@ - #define SYSRQ_ENABLE_BOOT 0x0080 - #define SYSRQ_ENABLE_RTNICE 0x0100 - -+#define SYSRQ_DISABLE_USERSPACE 0x00010000 -+ - struct sysrq_key_op { - void (*handler)(int); - char *help_msg; -@@ -43,8 +45,12 @@ struct sysrq_key_op { - * are available -- else NULL's). - */ - -+#define SYSRQ_FROM_KERNEL 0x0001 -+#define SYSRQ_FROM_PROC 0x0002 -+#define SYSRQ_FROM_SYNTHETIC 0x0004 -+ - void handle_sysrq(int key); --void __handle_sysrq(int key, bool check_mask); -+void __handle_sysrq(int key, unsigned int from); - int register_sysrq_key(int key, struct sysrq_key_op *op); - int unregister_sysrq_key(int key, struct sysrq_key_op *op); - struct sysrq_key_op *__sysrq_get_key_op(int key); -diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c -index 4567fe998c30..d05142ef44c4 100644 ---- a/kernel/debug/kdb/kdb_main.c -+++ b/kernel/debug/kdb/kdb_main.c -@@ -1981,7 +1981,7 @@ static int kdb_sr(int argc, const char **argv) - return KDB_ARGCOUNT; - - kdb_trap_printk++; -- __handle_sysrq(*argv[1], check_mask); -+ __handle_sysrq(*argv[1], check_mask ? SYSRQ_FROM_KERNEL : 0); - kdb_trap_printk--; - - return 0; -diff --git a/security/lockdown/Kconfig b/security/lockdown/Kconfig -index e84ddf484010..20e979178e1c 100644 ---- a/security/lockdown/Kconfig -+++ b/security/lockdown/Kconfig -@@ -45,3 +45,14 @@ config LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY - disabled. - - endchoice -+ -+config ALLOW_LOCKDOWN_LIFT_BY_SYSRQ -+ bool "Allow the kernel lockdown to be lifted by SysRq" -+ depends on SECURITY_LOCKDOWN_LSM -+ depends on !LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY -+ depends on !LOCK_DOWN_KERNEL_FORCE_INTEGRITY -+ depends on MAGIC_SYSRQ -+ depends on X86 -+ help -+ Allow setting the lockdown mode to "none" by pressing a SysRq key -+ combination on a wired keyboard. On x86, this is SysRq+x -diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c -index 8a10b43daf74..df4662257309 100644 ---- a/security/lockdown/lockdown.c -+++ b/security/lockdown/lockdown.c -@@ -13,6 +13,8 @@ - #include - #include - #include -+#include -+#include - - static enum lockdown_reason kernel_locked_down; - -@@ -179,6 +181,47 @@ static int __init lockdown_secfs_init(void) - return PTR_ERR_OR_ZERO(dentry); - } - -+#ifdef CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ -+ -+/* -+ * Take the kernel out of lockdown mode. -+ */ -+static void lift_kernel_lockdown(void) -+{ -+ pr_notice("Lifting lockdown\n"); -+ kernel_locked_down = LOCKDOWN_NONE; -+} -+ -+/* -+ * Allow lockdown to be lifted by pressing something like SysRq+x (and not by -+ * echoing the appropriate letter into the sysrq-trigger file). -+ */ -+static void sysrq_handle_lockdown_lift(int key) -+{ -+ if (kernel_locked_down) -+ lift_kernel_lockdown(); -+} -+ -+static struct sysrq_key_op lockdown_lift_sysrq_op = { -+ .handler = sysrq_handle_lockdown_lift, -+ .help_msg = "unSB(x)", -+ .action_msg = "Disabling Secure Boot restrictions", -+ .enable_mask = SYSRQ_DISABLE_USERSPACE, -+}; -+ -+static int __init lockdown_lift_sysrq(void) -+{ -+ if (kernel_locked_down) { -+ lockdown_lift_sysrq_op.help_msg[5] = LOCKDOWN_LIFT_KEY; -+ register_sysrq_key(LOCKDOWN_LIFT_KEY, &lockdown_lift_sysrq_op); -+ } -+ return 0; -+} -+ -+late_initcall(lockdown_lift_sysrq); -+ -+#endif /* CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ */ -+ - core_initcall(lockdown_secfs_init); - - #ifdef CONFIG_SECURITY_LOCKDOWN_LSM_EARLY --- -2.21.0 - -- cgit From a2e8b8ba8eea1e6d314c7a7b3ee73deb2a229311 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 10 Feb 2020 17:12:07 -0600 Subject: Disable CONFIG_SFI --- configs/fedora/generic/x86/CONFIG_SFI | 2 +- kernel-i686-debug-fedora.config | 2 +- kernel-i686-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/fedora/generic/x86/CONFIG_SFI b/configs/fedora/generic/x86/CONFIG_SFI index 4754983e1..6857591ec 100644 --- a/configs/fedora/generic/x86/CONFIG_SFI +++ b/configs/fedora/generic/x86/CONFIG_SFI @@ -1 +1 @@ -CONFIG_SFI=y +# CONFIG_SFI is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 8c6ee7059..9cfceac7e 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -5149,7 +5149,7 @@ CONFIG_SERIO=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set -CONFIG_SFI=y +# CONFIG_SFI is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index aea0f7210..6a4f6148c 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -5129,7 +5129,7 @@ CONFIG_SERIO=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set -CONFIG_SFI=y +# CONFIG_SFI is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index bd0967a1c..530d0c796 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5195,7 +5195,7 @@ CONFIG_SFC=m CONFIG_SFC_MCDI_MON=y CONFIG_SFC_MTD=y CONFIG_SFC_SRIOV=y -CONFIG_SFI=y +# CONFIG_SFI is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m # CONFIG_SGI_GRU_DEBUG is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index e84c5b4c0..ad8735699 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5175,7 +5175,7 @@ CONFIG_SFC=m CONFIG_SFC_MCDI_MON=y CONFIG_SFC_MTD=y CONFIG_SFC_SRIOV=y -CONFIG_SFI=y +# CONFIG_SFI is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m # CONFIG_SGI_GRU_DEBUG is not set -- cgit From 90f94e196fa383fb2c105567231d414fb39e6d70 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 11 Feb 2020 11:05:15 +0000 Subject: revert 4d40f2e8 (rockchips PCIE) because it's disabled for a reason and documented in bug 1704945 --- configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST | 1 - configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE | 1 - kernel-aarch64-debug-fedora.config | 4 ++-- kernel-aarch64-fedora.config | 4 ++-- kernel.spec | 3 --- 5 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST delete mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST b/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST deleted file mode 100644 index 416bd56df..000000000 --- a/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PCIE_ROCKCHIP_HOST=m diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE deleted file mode 100644 index 20fb6074b..000000000 --- a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PHY_ROCKCHIP_PCIE=m diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 8a897011f..195e408fc 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -4478,7 +4478,7 @@ CONFIG_PCIE_KIRIN=y CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCIE_QCOM=y -CONFIG_PCIE_ROCKCHIP_HOST=m +# CONFIG_PCIE_ROCKCHIP_HOST is not set CONFIG_PCIE_TEGRA194=m CONFIG_PCIE_XILINX_NWL=y CONFIG_PCIE_XILINX=y @@ -4575,7 +4575,7 @@ CONFIG_PHY_ROCKCHIP_EMMC=m CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m CONFIG_PHY_ROCKCHIP_INNO_HDMI=m CONFIG_PHY_ROCKCHIP_INNO_USB2=m -CONFIG_PHY_ROCKCHIP_PCIE=m +# CONFIG_PHY_ROCKCHIP_PCIE is not set CONFIG_PHY_ROCKCHIP_TYPEC=m CONFIG_PHY_ROCKCHIP_USB=m # CONFIG_PHY_SAMSUNG_USB2 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index bc6d67fb3..07ab4e405 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -4458,7 +4458,7 @@ CONFIG_PCIE_KIRIN=y CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCIE_QCOM=y -CONFIG_PCIE_ROCKCHIP_HOST=m +# CONFIG_PCIE_ROCKCHIP_HOST is not set CONFIG_PCIE_TEGRA194=m CONFIG_PCIE_XILINX_NWL=y CONFIG_PCIE_XILINX=y @@ -4555,7 +4555,7 @@ CONFIG_PHY_ROCKCHIP_EMMC=m CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m CONFIG_PHY_ROCKCHIP_INNO_HDMI=m CONFIG_PHY_ROCKCHIP_INNO_USB2=m -CONFIG_PHY_ROCKCHIP_PCIE=m +# CONFIG_PHY_ROCKCHIP_PCIE is not set CONFIG_PHY_ROCKCHIP_TYPEC=m CONFIG_PHY_ROCKCHIP_USB=m # CONFIG_PHY_SAMSUNG_USB2 is not set diff --git a/kernel.spec b/kernel.spec index acfac4d88..3fd666cec 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2889,9 +2889,6 @@ fi * Mon Feb 10 2020 Jeremy Cline - Remove sysrq support to lift lockdown (rhbz 1800859) -* Fri Feb 07 2020 Jeremy Cline -- Enable PCI Express devices on RockChip SoCs (rhbz 1792564) - * Wed Feb 05 2020 Justin M. Forbes - 5.5.2-200 - Linux v5.5.2 -- cgit