diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-05-11 11:27:02 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-05-12 12:36:28 +0200 |
commit | ef2d5a2ab46c44ad4145488913ac9d0bbb8c69df (patch) | |
tree | c3a8c82576d9f459ed353334c52aa43d0a94c890 /target/linux/generic/pending-4.14 | |
parent | a0081b19452d8f052757bbe356a6e037ff9afdd3 (diff) | |
download | upstream-ef2d5a2ab46c44ad4145488913ac9d0bbb8c69df.tar.gz upstream-ef2d5a2ab46c44ad4145488913ac9d0bbb8c69df.tar.bz2 upstream-ef2d5a2ab46c44ad4145488913ac9d0bbb8c69df.zip |
kernel: bump 4.14 to 4.14.180
Refreshed all patches.
Fixes:
- CVE-2020-12114
- CVE-2020-11669
Compile-tested on: pistachio
Runtime-tested on: none
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.14')
3 files changed, 5 insertions, 19 deletions
diff --git a/target/linux/generic/pending-4.14/270-platform-mikrotik-build-bits.patch b/target/linux/generic/pending-4.14/270-platform-mikrotik-build-bits.patch index 5f1009bf31..15dfcb2eba 100644 --- a/target/linux/generic/pending-4.14/270-platform-mikrotik-build-bits.patch +++ b/target/linux/generic/pending-4.14/270-platform-mikrotik-build-bits.patch @@ -14,8 +14,6 @@ Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org> drivers/platform/Makefile | 1 + 2 files changed, 3 insertions(+) -diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig -index c11db8b..0283f0b 100644 --- a/drivers/platform/Kconfig +++ b/drivers/platform/Kconfig @@ -8,3 +8,5 @@ endif @@ -24,8 +22,6 @@ index c11db8b..0283f0b 100644 source "drivers/platform/chrome/Kconfig" + +source "drivers/platform/mikrotik/Kconfig" -diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile -index d3a6630..ad290c3 100644 --- a/drivers/platform/Makefile +++ b/drivers/platform/Makefile @@ -8,3 +8,4 @@ obj-$(CONFIG_MIPS) += mips/ @@ -33,6 +29,3 @@ index d3a6630..ad290c3 100644 obj-$(CONFIG_GOLDFISH) += goldfish/ obj-$(CONFIG_CHROME_PLATFORMS) += chrome/ +obj-$(CONFIG_MIKROTIK) += mikrotik/ --- -2.11.0 - diff --git a/target/linux/generic/pending-4.14/435-mtd-add-routerbootpart-parser-config.patch b/target/linux/generic/pending-4.14/435-mtd-add-routerbootpart-parser-config.patch index 192886b102..946af76f5b 100644 --- a/target/linux/generic/pending-4.14/435-mtd-add-routerbootpart-parser-config.patch +++ b/target/linux/generic/pending-4.14/435-mtd-add-routerbootpart-parser-config.patch @@ -14,8 +14,6 @@ Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org> drivers/mtd/parsers/Makefile | 1 + 2 files changed, 10 insertions(+) -diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig -index d206b3c..58cbdd6 100644 --- a/drivers/mtd/parsers/Kconfig +++ b/drivers/mtd/parsers/Kconfig @@ -6,3 +6,12 @@ config MTD_PARSER_TRX @@ -31,13 +29,8 @@ index d206b3c..58cbdd6 100644 + flash, some of which are fixed and some of which are located at + variable offsets. This parser handles both cases via properly + formatted DTS. -diff --git a/drivers/mtd/parsers/Makefile b/drivers/mtd/parsers/Makefile -index 4d9024e..41d363a 100644 --- a/drivers/mtd/parsers/Makefile +++ b/drivers/mtd/parsers/Makefile @@ -1 +1,2 @@ obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o +obj-$(CONFIG_MTD_ROUTERBOOT_PARTS) += routerbootpart.o --- -2.11.0 - diff --git a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 067de75f3c..286e98f5d5 100644 --- a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> __u16 tc_index; /* traffic control index */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4805,6 +4805,9 @@ static enum gro_result dev_gro_receive(s +@@ -4806,6 +4806,9 @@ static enum gro_result dev_gro_receive(s enum gro_result ret; int grow; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (netif_elide_gro(skb->dev)) goto normal; -@@ -6282,6 +6285,48 @@ static void __netdev_adjacent_dev_unlink +@@ -6283,6 +6286,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info) -@@ -6320,6 +6365,7 @@ static int __netdev_upper_dev_link(struc +@@ -6321,6 +6366,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -6397,6 +6443,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -6398,6 +6444,7 @@ void netdev_upper_dev_unlink(struct net_ __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); } -@@ -6961,6 +7008,7 @@ int dev_set_mac_address(struct net_devic +@@ -6962,6 +7009,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; |