hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kernel: bump 4.9 to 4.9.194 

Refreshed all patches.

Fixes:
- CVE-2019-14814
- CVE-2019-14815
- CVE-2019-14816
- CVE-2019-14821

Compile-tested on: ar71xx
Runtime-tested on: ar71xx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
openwrt-18.06
Koen Vandeputte 2019-09-24 10:59:28 +02:00
parent 45a2c0f309
commit 3699327da3
11 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -2,10 +2,10 @@
LINUX_RELEASE?=1 LINUX_RELEASE?=1
LINUX_VERSION-4.9 = .193 LINUX_VERSION-4.9 = .194
LINUX_VERSION-4.14 = .145 LINUX_VERSION-4.14 = .145
LINUX_KERNEL_HASH-4.9.193 = 9be5081cc0fa6b720e6b3e5cb90296f3d857469bb3cda09ff93db00f9e16fd01 LINUX_KERNEL_HASH-4.9.194 = d5f4bb7584e461f1faa9a3f94c2ad292246fe692b0e992e072dac255f806c2e3
LINUX_KERNEL_HASH-4.14.145 = eb05b5806713263a6d5bfa1e018ad07c3f4b3c6e71032306a94d7113ed594929 LINUX_KERNEL_HASH-4.14.145 = eb05b5806713263a6d5bfa1e018ad07c3f4b3c6e71032306a94d7113ed594929
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))

2
target/linux/ar7/patches-4.9/300-add-ac49x-platform.patch
View File

@ -46,7 +46,7 @@
config ATH25 config ATH25
bool "Atheros AR231x/AR531x SoC support" bool "Atheros AR231x/AR531x SoC support"
@@ -1009,6 +1009,7 @@ config MIPS_PARAVIRT @@ -1006,6 +1006,7 @@ config MIPS_PARAVIRT
endchoice endchoice
source "arch/mips/alchemy/Kconfig" source "arch/mips/alchemy/Kconfig"

2
target/linux/ar71xx/patches-4.9/500-MIPS-fw-myloader.patch
View File

@ -10,7 +10,7 @@
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -1154,6 +1154,9 @@ config MIPS_MSC @@ -1151,6 +1151,9 @@ config MIPS_MSC
config MIPS_NILE4 config MIPS_NILE4
bool bool

2
target/linux/generic/hack-4.9/301-mips_image_cmdline_hack.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -1160,6 +1160,10 @@ config SYNC_R4K @@ -1157,6 +1157,10 @@ config SYNC_R4K
config MIPS_MACHINE config MIPS_MACHINE
def_bool n def_bool n

2
target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch
View File

@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
EXPORT_SYMBOL(default_qdisc_ops); EXPORT_SYMBOL(default_qdisc_ops);
/* Main transmission queue. */ /* Main transmission queue. */
@@ -760,7 +760,7 @@ static void attach_one_default_qdisc(str @@ -764,7 +764,7 @@ static void attach_one_default_qdisc(str
void *_unused) void *_unused)
{ {
struct Qdisc *qdisc; struct Qdisc *qdisc;

4
target/linux/generic/pending-4.9/300-mips_expose_boot_raw.patch
View File

@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob@landley.net>
--- ---
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -1069,9 +1069,6 @@ config FW_ARC @@ -1066,9 +1066,6 @@ config FW_ARC
config ARCH_MAY_HAVE_PC_FDC config ARCH_MAY_HAVE_PC_FDC
bool bool
@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480 config CEVT_BCM1480
bool bool
@@ -2968,6 +2965,18 @@ choice @@ -2965,6 +2962,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments" bool "Extend builtin kernel arguments with bootloader arguments"
endchoice endchoice

2
target/linux/generic/pending-4.9/304-mips_disable_fpu.patch
View File

@ -24,7 +24,7 @@ v2: incorporated changes suggested by Jonas Gorski
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -2892,6 +2892,20 @@ config MIPS_O32_FP64_SUPPORT @@ -2889,6 +2889,20 @@ config MIPS_O32_FP64_SUPPORT
If unsure, say N. If unsure, say N.

8
target/linux/generic/pending-4.9/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch
View File

@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
select HAVE_PCSPKR_PLATFORM select HAVE_PCSPKR_PLATFORM
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select I8253 select I8253
@@ -1130,6 +1132,9 @@ config DMA_NONCOHERENT @@ -1127,6 +1129,9 @@ config DMA_NONCOHERENT
bool bool
select NEED_DMA_MAP_STATE select NEED_DMA_MAP_STATE
@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
config NEED_DMA_MAP_STATE config NEED_DMA_MAP_STATE
bool bool
@@ -1654,6 +1659,7 @@ config CPU_R10000 @@ -1651,6 +1656,7 @@ config CPU_R10000
select CPU_SUPPORTS_64BIT_KERNEL select CPU_SUPPORTS_64BIT_KERNEL
select CPU_SUPPORTS_HIGHMEM select CPU_SUPPORTS_HIGHMEM
select CPU_SUPPORTS_HUGEPAGES select CPU_SUPPORTS_HUGEPAGES
@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
help help
MIPS Technologies R10000-series processors. MIPS Technologies R10000-series processors.
@@ -1899,9 +1905,11 @@ config SYS_HAS_CPU_MIPS32_R3_5 @@ -1896,9 +1902,11 @@ config SYS_HAS_CPU_MIPS32_R3_5
bool bool
config SYS_HAS_CPU_MIPS32_R5 config SYS_HAS_CPU_MIPS32_R5
@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
bool bool
config SYS_HAS_CPU_MIPS64_R1 config SYS_HAS_CPU_MIPS64_R1
@@ -1911,6 +1919,7 @@ config SYS_HAS_CPU_MIPS64_R2 @@ -1908,6 +1916,7 @@ config SYS_HAS_CPU_MIPS64_R2
bool bool
config SYS_HAS_CPU_MIPS64_R6 config SYS_HAS_CPU_MIPS64_R6

2
target/linux/lantiq/patches-4.9/0152-lantiq-VPE.patch
View File

@ -1,6 +1,6 @@
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -2325,6 +2325,12 @@ config MIPS_VPE_LOADER @@ -2322,6 +2322,12 @@ config MIPS_VPE_LOADER
Includes a loader for loading an elf relocatable object Includes a loader for loading an elf relocatable object
onto another VPE and running it. onto another VPE and running it.

6
target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch
View File

@ -34,7 +34,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
return entry->group; return entry->group;
} }
@@ -3185,9 +3187,10 @@ static bool amd_iommu_capable(enum iommu @@ -3191,9 +3193,10 @@ static bool amd_iommu_capable(enum iommu
return false; return false;
} }
@ -47,7 +47,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
struct unity_map_entry *entry; struct unity_map_entry *entry;
int devid; int devid;
@@ -3196,41 +3199,56 @@ static void amd_iommu_get_dm_regions(str @@ -3202,41 +3205,56 @@ static void amd_iommu_get_dm_regions(str
return; return;
list_for_each_entry(entry, &amd_iommu_unity_map, list) { list_for_each_entry(entry, &amd_iommu_unity_map, list) {
@ -118,7 +118,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
{ {
struct dma_ops_domain *dma_dom = to_dma_ops_domain(to_pdomain(domain)); struct dma_ops_domain *dma_dom = to_dma_ops_domain(to_pdomain(domain));
unsigned long start, end; unsigned long start, end;
@@ -3254,9 +3272,9 @@ static const struct iommu_ops amd_iommu_ @@ -3260,9 +3278,9 @@ static const struct iommu_ops amd_iommu_
.add_device = amd_iommu_add_device, .add_device = amd_iommu_add_device,
.remove_device = amd_iommu_remove_device, .remove_device = amd_iommu_remove_device,
.device_group = amd_iommu_device_group, .device_group = amd_iommu_device_group,

8
target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch
View File

@ -44,7 +44,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
--- a/drivers/net/usb/cdc_ether.c --- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c
@@ -533,6 +533,7 @@ static const struct driver_info wwan_inf @@ -540,6 +540,7 @@ static const struct driver_info wwan_inf
#define LINKSYS_VENDOR_ID 0x13b1 #define LINKSYS_VENDOR_ID 0x13b1
#define NVIDIA_VENDOR_ID 0x0955 #define NVIDIA_VENDOR_ID 0x0955
#define HP_VENDOR_ID 0x03f0 #define HP_VENDOR_ID 0x03f0
@ -52,7 +52,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
static const struct usb_device_id products[] = { static const struct usb_device_id products[] = {
/* BLACKLIST !! /* BLACKLIST !!
@@ -742,6 +743,13 @@ static const struct usb_device_id produc @@ -749,6 +750,13 @@ static const struct usb_device_id produc
USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
.driver_info = 0, .driver_info = 0,
}, },
@ -76,7 +76,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
#define MCU_TYPE_PLA 0x0100 #define MCU_TYPE_PLA 0x0100
#define MCU_TYPE_USB 0x0000 #define MCU_TYPE_USB 0x0000
@@ -1817,6 +1818,10 @@ static int rx_bottom(struct r8152 *tp, i @@ -1820,6 +1821,10 @@ static int rx_bottom(struct r8152 *tp, i
unsigned int pkt_len; unsigned int pkt_len;
struct sk_buff *skb; struct sk_buff *skb;
@ -87,7 +87,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
pkt_len = le32_to_cpu(rx_desc->opts1) & RX_LEN_MASK; pkt_len = le32_to_cpu(rx_desc->opts1) & RX_LEN_MASK;
if (pkt_len < ETH_ZLEN) if (pkt_len < ETH_ZLEN)
break; break;
@@ -4513,6 +4518,7 @@ static struct usb_device_id rtl8152_tabl @@ -4516,6 +4521,7 @@ static struct usb_device_id rtl8152_tabl
{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)}, {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)},
{REALTEK_USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041)}, {REALTEK_USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041)},
{REALTEK_USB_DEVICE(VENDOR_ID_NVIDIA, 0x09ff)}, {REALTEK_USB_DEVICE(VENDOR_ID_NVIDIA, 0x09ff)},