diff --git a/CIP.txt b/CIP.txt index 2d031f988407f30bab0c0781e4dffb75051fd052..2d9d13405a19e01f3f78bcf67c53713d1f8b03d2 100644 --- a/CIP.txt +++ b/CIP.txt @@ -1,4 +1,4 @@ -#Last checked 2021-06-16 +#Last checked 2021-06-22 CVE-2006-6058 Link - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f44ec6f3f89889a469773b1fd894f8fcc07c29cf CVE-2007-3740 @@ -13069,8 +13069,6 @@ CVE-2020-36322 Link - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5d069dbe8aaf2a197142558b6fb2978189ba3454 Link - 5.10 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=36cf9ae54b0ead0daab7701a994de3dcd9ef605d Link - 5.4 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=732251cabeb3bfd917d453a42274d769d6883fc4 -CVE-2020-36385 - Link - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f5449e74802c1112dea984aec8af7a33c4516af1 CVE-2020-36386 Link - 3.18 - https://android.googlesource.com/kernel/common/+/66fe83d7a8e08c4754b71d37061122778766995d Link - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=51c19bf3d5cfaa66571e4b88ba2a6f6295311101 @@ -13629,6 +13627,8 @@ CVE-2021-31916 Link - 4.9 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c13f07341685149cfbc2014e8b4a85ff56d4ae0e Link - 5.10 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=921aae17bb0f02181fa05cf5580ebc855fdbd74d Link - 5.4 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e6587d142d0214eb466f9978e25f0575c19b1ea0 +CVE-2021-32078 + Link - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=298a58e165e447ccfaae35fe9f651f9d7e15166f CVE-2021-32399 Link - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e2cb6b891ad2b8caa9131e3be70f45243df82a80 Link - 4.14 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=40acc1aa3e2a705a3c2ed171ed563ef04f7ba19e diff --git a/CVE-2021-32078/^5.12/0001.patch b/CVE-2021-32078/^5.12/0001.patch new file mode 100644 index 0000000000000000000000000000000000000000..39a611d529d69a7e06a83ff31457bb1f08c33d89 --- /dev/null +++ b/CVE-2021-32078/^5.12/0001.patch @@ -0,0 +1,178 @@ +From 298a58e165e447ccfaae35fe9f651f9d7e15166f Mon Sep 17 00:00:00 2001 +From: Russell King <rmk+kernel@armlinux.org.uk> +Date: Wed, 5 May 2021 11:23:50 +0100 +Subject: ARM: footbridge: remove personal server platform + +Remove the personal server platform, as that has had an array overrun +issue identified. It is believed that no one is using this code. + +Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> +--- + arch/arm/configs/footbridge_defconfig | 1 - + arch/arm/mach-footbridge/Kconfig | 21 ------------ + arch/arm/mach-footbridge/Makefile | 2 -- + arch/arm/mach-footbridge/personal-pci.c | 58 --------------------------------- + arch/arm/mach-footbridge/personal.c | 25 -------------- + 5 files changed, 107 deletions(-) + delete mode 100644 arch/arm/mach-footbridge/personal-pci.c + delete mode 100644 arch/arm/mach-footbridge/personal.c + +diff --git a/arch/arm/configs/footbridge_defconfig b/arch/arm/configs/footbridge_defconfig +index 3a7938f244e56..2aa3ebeb89d7f 100644 +--- a/arch/arm/configs/footbridge_defconfig ++++ b/arch/arm/configs/footbridge_defconfig +@@ -7,7 +7,6 @@ CONFIG_EXPERT=y + CONFIG_MODULES=y + CONFIG_ARCH_FOOTBRIDGE=y + CONFIG_ARCH_CATS=y +-CONFIG_ARCH_PERSONAL_SERVER=y + CONFIG_ARCH_EBSA285_HOST=y + CONFIG_ARCH_NETWINDER=y + CONFIG_LEDS=y +diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig +index 844aa585b9662..728aff93fba9d 100644 +--- a/arch/arm/mach-footbridge/Kconfig ++++ b/arch/arm/mach-footbridge/Kconfig +@@ -16,27 +16,6 @@ config ARCH_CATS + + Saying N will reduce the size of the Footbridge kernel. + +-config ARCH_PERSONAL_SERVER +- bool "Compaq Personal Server" +- select FOOTBRIDGE_HOST +- select ISA +- select ISA_DMA +- select FORCE_PCI +- help +- Say Y here if you intend to run this kernel on the Compaq +- Personal Server. +- +- Saying N will reduce the size of the Footbridge kernel. +- +- The Compaq Personal Server is not available for purchase. +- There are no product plans beyond the current research +- prototypes at this time. Information is available at: +- +- <http://www.crl.hpl.hp.com/projects/personalserver/> +- +- If you have any questions or comments about the Compaq Personal +- Server, send e-mail to <skiff@crl.dec.com>. +- + config ARCH_EBSA285_ADDIN + bool "EBSA285 (addin mode)" + select ARCH_EBSA285 +diff --git a/arch/arm/mach-footbridge/Makefile b/arch/arm/mach-footbridge/Makefile +index a09f1041f1413..6262993c05558 100644 +--- a/arch/arm/mach-footbridge/Makefile ++++ b/arch/arm/mach-footbridge/Makefile +@@ -11,12 +11,10 @@ pci-y += dc21285.o + pci-$(CONFIG_ARCH_CATS) += cats-pci.o + pci-$(CONFIG_ARCH_EBSA285_HOST) += ebsa285-pci.o + pci-$(CONFIG_ARCH_NETWINDER) += netwinder-pci.o +-pci-$(CONFIG_ARCH_PERSONAL_SERVER) += personal-pci.o + + obj-$(CONFIG_ARCH_CATS) += cats-hw.o isa-timer.o + obj-$(CONFIG_ARCH_EBSA285) += ebsa285.o dc21285-timer.o + obj-$(CONFIG_ARCH_NETWINDER) += netwinder-hw.o isa-timer.o +-obj-$(CONFIG_ARCH_PERSONAL_SERVER) += personal.o dc21285-timer.o + + obj-$(CONFIG_PCI) +=$(pci-y) + +diff --git a/arch/arm/mach-footbridge/personal-pci.c b/arch/arm/mach-footbridge/personal-pci.c +deleted file mode 100644 +index 4391e433a4b2f..0000000000000 +--- a/arch/arm/mach-footbridge/personal-pci.c ++++ /dev/null +@@ -1,58 +0,0 @@ +-// SPDX-License-Identifier: GPL-2.0 +-/* +- * linux/arch/arm/mach-footbridge/personal-pci.c +- * +- * PCI bios-type initialisation for PCI machines +- * +- * Bits taken from various places. +- */ +-#include <linux/kernel.h> +-#include <linux/pci.h> +-#include <linux/init.h> +- +-#include <asm/irq.h> +-#include <asm/mach/pci.h> +-#include <asm/mach-types.h> +- +-static int irqmap_personal_server[] __initdata = { +- IRQ_IN0, IRQ_IN1, IRQ_IN2, IRQ_IN3, 0, 0, 0, +- IRQ_DOORBELLHOST, IRQ_DMA1, IRQ_DMA2, IRQ_PCI +-}; +- +-static int __init personal_server_map_irq(const struct pci_dev *dev, u8 slot, +- u8 pin) +-{ +- unsigned char line; +- +- pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &line); +- +- if (line > 0x40 && line <= 0x5f) { +- /* line corresponds to the bit controlling this interrupt +- * in the footbridge. Ignore the first 8 interrupt bits, +- * look up the rest in the map. IN0 is bit number 8 +- */ +- return irqmap_personal_server[(line & 0x1f) - 8]; +- } else if (line == 0) { +- /* no interrupt */ +- return 0; +- } else +- return irqmap_personal_server[(line - 1) & 3]; +-} +- +-static struct hw_pci personal_server_pci __initdata = { +- .map_irq = personal_server_map_irq, +- .nr_controllers = 1, +- .ops = &dc21285_ops, +- .setup = dc21285_setup, +- .preinit = dc21285_preinit, +- .postinit = dc21285_postinit, +-}; +- +-static int __init personal_pci_init(void) +-{ +- if (machine_is_personal_server()) +- pci_common_init(&personal_server_pci); +- return 0; +-} +- +-subsys_initcall(personal_pci_init); +diff --git a/arch/arm/mach-footbridge/personal.c b/arch/arm/mach-footbridge/personal.c +deleted file mode 100644 +index ca715754fc007..0000000000000 +--- a/arch/arm/mach-footbridge/personal.c ++++ /dev/null +@@ -1,25 +0,0 @@ +-// SPDX-License-Identifier: GPL-2.0 +-/* +- * linux/arch/arm/mach-footbridge/personal.c +- * +- * Personal server (Skiff) machine fixup +- */ +-#include <linux/init.h> +-#include <linux/spinlock.h> +- +-#include <asm/hardware/dec21285.h> +-#include <asm/mach-types.h> +- +-#include <asm/mach/arch.h> +- +-#include "common.h" +- +-MACHINE_START(PERSONAL_SERVER, "Compaq-PersonalServer") +- /* Maintainer: Jamey Hicks / George France */ +- .atag_offset = 0x100, +- .map_io = footbridge_map_io, +- .init_irq = footbridge_init_irq, +- .init_time = footbridge_timer_init, +- .restart = footbridge_restart, +-MACHINE_END +- +-- +cgit 1.2.3-1.el7 + diff --git a/Kernel_CVE_Patch_List.txt b/Kernel_CVE_Patch_List.txt index 397e000c060f9623cf642cbabe8ba7af5d4096b4..8f0bf143015867c1aa2447725526d5d0077a30c4 100644 --- a/Kernel_CVE_Patch_List.txt +++ b/Kernel_CVE_Patch_List.txt @@ -1,4 +1,4 @@ -#Last checked 2021-06-16 +#Last checked 2021-06-22 #This is a combined list from the following sources # https://source.android.com/security/bulletin # https://source.android.com/security/bulletin/pixel @@ -15842,6 +15842,8 @@ CVE-2021-31916 Link - 5.4 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e6587d142d0214eb466f9978e25f0575c19b1ea0 Link - 4.4 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0c0f93fbd20276d65ae0581edfcdc93579aa1dc7 Link - 4.9 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c13f07341685149cfbc2014e8b4a85ff56d4ae0e +CVE-2021-32078 + Link - ^5.12 - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=298a58e165e447ccfaae35fe9f651f9d7e15166f CVE-2021-32399 Link - ^5.12 - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e2cb6b891ad2b8caa9131e3be70f45243df82a80 Link - 4.14 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=40acc1aa3e2a705a3c2ed171ed563ef04f7ba19e