From c5b10c828239ec045e94503c1c218fe06b295c44 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Fri, 20 Sep 2019 15:11:19 +0200 Subject: [PATCH] kernel: bump 4.19 to 4.19.74 Refreshed all patches. Fixes: - CVE-2019-15504 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 ++-- ...0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch | 4 ++-- .../patches-4.19/950-0392-nvmem-add-type-attribute.patch | 2 +- ...0-0802-regulator-gpio-Allow-nonexclusive-GPIO-access.patch | 2 +- ...0-0803-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch | 2 +- target/linux/generic/hack-4.19/204-module_strip.patch | 4 ++-- .../linux/generic/hack-4.19/661-use_fq_codel_by_default.patch | 2 +- target/linux/generic/hack-4.19/662-remove_pfifo_fast.patch | 2 +- ...132-spi-spi-gpio-fix-crash-when-num-chipselects-is-0.patch | 4 +--- 9 files changed, 12 insertions(+), 14 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 7f4ba25930..2cb4a4344a 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,11 +8,11 @@ endif LINUX_VERSION-4.9 = .193 LINUX_VERSION-4.14 = .145 -LINUX_VERSION-4.19 = .73 +LINUX_VERSION-4.19 = .74 LINUX_KERNEL_HASH-4.9.193 = 9be5081cc0fa6b720e6b3e5cb90296f3d857469bb3cda09ff93db00f9e16fd01 LINUX_KERNEL_HASH-4.14.145 = eb05b5806713263a6d5bfa1e018ad07c3f4b3c6e71032306a94d7113ed594929 -LINUX_KERNEL_HASH-4.19.73 = 7db5e77ef2a2d8da4b128b7d47d7dd645ebcde2d19c1d191793e1eeefc275fab +LINUX_KERNEL_HASH-4.19.74 = 495c2fead329c2c6b17950faa07ad7406e5aa93560e5e58de93a71197579ee82 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/brcm2708/patches-4.19/950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch b/target/linux/brcm2708/patches-4.19/950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch index 9cb434693e..d72064166d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch +++ b/target/linux/brcm2708/patches-4.19/950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell /* Device and char device-related information */ static DEFINE_IDA(gpio_ida); static dev_t gpio_devt; -@@ -2628,7 +2630,7 @@ int gpiod_direction_output(struct gpio_d +@@ -2634,7 +2636,7 @@ int gpiod_direction_output(struct gpio_d value = !!value; /* GPIOs used for IRQs shall not be set as output */ @@ -35,7 +35,7 @@ Signed-off-by: Phil Elwell gpiod_err(desc, "%s: tried to set a GPIO tied to an IRQ as output\n", __func__); -@@ -3316,7 +3318,7 @@ int gpiochip_lock_as_irq(struct gpio_chi +@@ -3322,7 +3324,7 @@ int gpiochip_lock_as_irq(struct gpio_chi } } diff --git a/target/linux/brcm2708/patches-4.19/950-0392-nvmem-add-type-attribute.patch b/target/linux/brcm2708/patches-4.19/950-0392-nvmem-add-type-attribute.patch index 6065ad33f8..7e343f4dc7 100644 --- a/target/linux/brcm2708/patches-4.19/950-0392-nvmem-add-type-attribute.patch +++ b/target/linux/brcm2708/patches-4.19/950-0392-nvmem-add-type-attribute.patch @@ -82,7 +82,7 @@ Signed-off-by: Greg Kroah-Hartman }; static const struct attribute_group *nvmem_ro_root_dev_groups[] = { -@@ -478,6 +498,7 @@ struct nvmem_device *nvmem_register(cons +@@ -485,6 +505,7 @@ struct nvmem_device *nvmem_register(cons nvmem->dev.bus = &nvmem_bus_type; nvmem->dev.parent = config->dev; nvmem->priv = config->priv; diff --git a/target/linux/brcm2708/patches-4.19/950-0802-regulator-gpio-Allow-nonexclusive-GPIO-access.patch b/target/linux/brcm2708/patches-4.19/950-0802-regulator-gpio-Allow-nonexclusive-GPIO-access.patch index c7d3c99613..4c258ad54a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0802-regulator-gpio-Allow-nonexclusive-GPIO-access.patch +++ b/target/linux/brcm2708/patches-4.19/950-0802-regulator-gpio-Allow-nonexclusive-GPIO-access.patch @@ -41,7 +41,7 @@ Signed-off-by: Mark Brown --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -3942,8 +3942,23 @@ struct gpio_desc *__must_check gpiod_get +@@ -3948,8 +3948,23 @@ struct gpio_desc *__must_check gpiod_get * the device name as label */ status = gpiod_request(desc, con_id ? con_id : devname); diff --git a/target/linux/brcm2708/patches-4.19/950-0803-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch b/target/linux/brcm2708/patches-4.19/950-0803-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch index db58259ea1..4072f825b2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0803-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch +++ b/target/linux/brcm2708/patches-4.19/950-0803-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch @@ -23,7 +23,7 @@ Signed-off-by: Mark Brown --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -4016,6 +4016,8 @@ struct gpio_desc *gpiod_get_from_of_node +@@ -4022,6 +4022,8 @@ struct gpio_desc *gpiod_get_from_of_node transitory = flags & OF_GPIO_TRANSITORY; ret = gpiod_request(desc, label); diff --git a/target/linux/generic/hack-4.19/204-module_strip.patch b/target/linux/generic/hack-4.19/204-module_strip.patch index 2524307f45..b218e3b6a8 100644 --- a/target/linux/generic/hack-4.19/204-module_strip.patch +++ b/target/linux/generic/hack-4.19/204-module_strip.patch @@ -114,7 +114,7 @@ Signed-off-by: Felix Fietkau config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -3016,9 +3016,11 @@ static int setup_load_info(struct load_i +@@ -3025,9 +3025,11 @@ static int setup_load_info(struct load_i static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -127,7 +127,7 @@ Signed-off-by: Felix Fietkau if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -3039,6 +3041,7 @@ static int check_modinfo(struct module * +@@ -3048,6 +3050,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } diff --git a/target/linux/generic/hack-4.19/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-4.19/661-use_fq_codel_by_default.patch index 74adfa0c43..fc0761c3c0 100644 --- a/target/linux/generic/hack-4.19/661-use_fq_codel_by_default.patch +++ b/target/linux/generic/hack-4.19/661-use_fq_codel_by_default.patch @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau EXPORT_SYMBOL(default_qdisc_ops); /* Main transmission queue. */ -@@ -1004,7 +1004,7 @@ static void attach_one_default_qdisc(str +@@ -1009,7 +1009,7 @@ static void attach_one_default_qdisc(str void *_unused) { struct Qdisc *qdisc; diff --git a/target/linux/generic/hack-4.19/662-remove_pfifo_fast.patch b/target/linux/generic/hack-4.19/662-remove_pfifo_fast.patch index 0009940cd1..d545cdf7ee 100644 --- a/target/linux/generic/hack-4.19/662-remove_pfifo_fast.patch +++ b/target/linux/generic/hack-4.19/662-remove_pfifo_fast.patch @@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c -@@ -595,207 +595,6 @@ struct Qdisc_ops noqueue_qdisc_ops __rea +@@ -600,207 +600,6 @@ struct Qdisc_ops noqueue_qdisc_ops __rea .owner = THIS_MODULE, }; diff --git a/target/linux/generic/pending-4.19/132-spi-spi-gpio-fix-crash-when-num-chipselects-is-0.patch b/target/linux/generic/pending-4.19/132-spi-spi-gpio-fix-crash-when-num-chipselects-is-0.patch index 7c171745c2..ed94f937c9 100644 --- a/target/linux/generic/pending-4.19/132-spi-spi-gpio-fix-crash-when-num-chipselects-is-0.patch +++ b/target/linux/generic/pending-4.19/132-spi-spi-gpio-fix-crash-when-num-chipselects-is-0.patch @@ -43,11 +43,9 @@ Signed-off-by: Petr Å tetiar drivers/spi/spi-gpio.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c -index 088772ebef9b..57d5b6dc0dd0 100644 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c -@@ -242,10 +242,12 @@ static int spi_gpio_setup(struct spi_device *spi) +@@ -242,10 +242,12 @@ static int spi_gpio_setup(struct spi_dev * The CS GPIOs have already been * initialized from the descriptor lookup. */ -- 2.30.2