From fa0b5fce1f53c3520cacff49e9d371fb2c5c3685 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Mon, 16 Oct 2017 13:32:51 +0300 Subject: [PATCH] kernel: bump 4.4 to 4.4.92 Refresh patches. Fixes the following CVEs: - CVE-2017-1000252 - CVE-2017-12153 - CVE-2017-12154 Signed-off-by: Stijn Tintel --- include/kernel-version.mk | 4 ++-- .../0527-Support-for-Blokas-Labs-pisound-board.patch | 4 ++-- .../cns3xxx/patches-4.4/200-broadcom_phy_reinit.patch | 2 +- .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 +++++----- target/linux/generic/patches-4.4/721-phy_packets.patch | 2 +- .../patches-4.4/250-add-plxtech-vendor-prefix.patch | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index b4e29ff39a3..51e0dcf3660 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -3,10 +3,10 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .43 -LINUX_VERSION-4.4 = .89 +LINUX_VERSION-4.4 = .92 LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c -LINUX_KERNEL_HASH-4.4.89 = a81d1b1306e4fddee5d6f7219090a616073b02f4069e44522a9c0454b17f2b67 +LINUX_KERNEL_HASH-4.4.92 = 53f8cd8b024444df0f242f8e6ab5147b0b009d7a30e8b2ed3854e8d17937460d ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) diff --git a/target/linux/brcm2708/patches-4.4/0527-Support-for-Blokas-Labs-pisound-board.patch b/target/linux/brcm2708/patches-4.4/0527-Support-for-Blokas-Labs-pisound-board.patch index 44335f1fd24..72c2aad7812 100644 --- a/target/linux/brcm2708/patches-4.4/0527-Support-for-Blokas-Labs-pisound-board.patch +++ b/target/linux/brcm2708/patches-4.4/0527-Support-for-Blokas-Labs-pisound-board.patch @@ -19,8 +19,8 @@ Subject: [PATCH] Support for Blokas Labs pisound board --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt -@@ -33,6 +33,7 @@ auo AU Optronics Corporation - avago Avago Technologies +@@ -34,6 +34,7 @@ avago Avago Technologies + avia avia semiconductor avic Shanghai AVIC Optoelectronics Co., Ltd. axis Axis Communications AB +blokaslabs Vilniaus Blokas UAB diff --git a/target/linux/cns3xxx/patches-4.4/200-broadcom_phy_reinit.patch b/target/linux/cns3xxx/patches-4.4/200-broadcom_phy_reinit.patch index f3ae5e6f2bb..0352a89f9ee 100644 --- a/target/linux/cns3xxx/patches-4.4/200-broadcom_phy_reinit.patch +++ b/target/linux/cns3xxx/patches-4.4/200-broadcom_phy_reinit.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c -@@ -414,6 +414,11 @@ static int bcm5481_config_aneg(struct ph +@@ -420,6 +420,11 @@ static int bcm5481_config_aneg(struct ph /* Write bits 14:0. */ reg |= (1 << 15); phy_write(phydev, 0x18, reg); diff --git a/target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 0616eaa7c0a..b7ba384f4c6 100644 --- a/target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4256,6 +4256,9 @@ static enum gro_result dev_gro_receive(s +@@ -4259,6 +4259,9 @@ static enum gro_result dev_gro_receive(s enum gro_result ret; int grow; @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau if (!(skb->dev->features & NETIF_F_GRO)) goto normal; -@@ -5422,6 +5425,48 @@ static void __netdev_adjacent_dev_unlink +@@ -5425,6 +5428,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -76,7 +76,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *private) -@@ -5493,6 +5538,7 @@ static int __netdev_upper_dev_link(struc +@@ -5496,6 +5541,7 @@ static int __netdev_upper_dev_link(struc goto rollback_lower_mesh; } @@ -84,7 +84,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); return 0; -@@ -5619,6 +5665,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -5622,6 +5668,7 @@ void netdev_upper_dev_unlink(struct net_ list_for_each_entry(i, &upper_dev->all_adj_list.upper, list) __netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr); @@ -92,7 +92,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); } -@@ -6159,6 +6206,7 @@ int dev_set_mac_address(struct net_devic +@@ -6162,6 +6209,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; diff --git a/target/linux/generic/patches-4.4/721-phy_packets.patch b/target/linux/generic/patches-4.4/721-phy_packets.patch index 89ffdc558d5..a7a23278d04 100644 --- a/target/linux/generic/patches-4.4/721-phy_packets.patch +++ b/target/linux/generic/patches-4.4/721-phy_packets.patch @@ -86,7 +86,7 @@ help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -2743,10 +2743,20 @@ static int xmit_one(struct sk_buff *skb, +@@ -2746,10 +2746,20 @@ static int xmit_one(struct sk_buff *skb, if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) dev_queue_xmit_nit(skb, dev); diff --git a/target/linux/oxnas/patches-4.4/250-add-plxtech-vendor-prefix.patch b/target/linux/oxnas/patches-4.4/250-add-plxtech-vendor-prefix.patch index d6c5c627a6a..a94ac2277bb 100644 --- a/target/linux/oxnas/patches-4.4/250-add-plxtech-vendor-prefix.patch +++ b/target/linux/oxnas/patches-4.4/250-add-plxtech-vendor-prefix.patch @@ -1,6 +1,6 @@ --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt -@@ -174,6 +174,7 @@ picochip Picochip Ltd +@@ -175,6 +175,7 @@ picochip Picochip Ltd plathome Plat'Home Co., Ltd. plda PLDA pixcir PIXCIR MICROELECTRONICS Co., Ltd