Parcourir la source

kernel: bump 4.9 to 4.9.186

Refreshed all patches.

Fixes:
- CVE-2019-3846

Compile-tested on: none
Runtime-tested on: none

Signed-off-by: Koen Vandeputte <[email protected]>
Koen Vandeputte il y a 6 ans
Parent
commit
7228904092

+ 2 - 2
include/kernel-version.mk

@@ -6,11 +6,11 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-LINUX_VERSION-4.9 = .184
+LINUX_VERSION-4.9 = .186
 LINUX_VERSION-4.14 = .132
 LINUX_VERSION-4.19 = .57
 
-LINUX_KERNEL_HASH-4.9.184 = 033114d5350525dede995d31b596c31b0e26db8d77a0a1c53d36cdc36ead9faf
+LINUX_KERNEL_HASH-4.9.186 = 242484430d0729791d8efd92181b7d34b4021050646c6e00cf459866eab94b6a
 LINUX_KERNEL_HASH-4.14.132 = da86f39a722da656fce4e2685223093b5d5f4db94046fcd79e492428a82ff330
 LINUX_KERNEL_HASH-4.19.57 = 327c5759d5888361d6c9d6adb0c8ad7e3c624eb05bb9e5869d9f3078dd0d3f87
 

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

@@ -37,7 +37,7 @@
  #define AR7_IRQ_UART0	15
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -161,7 +161,7 @@ config AR7
+@@ -162,7 +162,7 @@ config AR7
  	select HAVE_CLK
  	help
  	  Support for the Texas Instruments AR7 System-on-a-Chip
@@ -46,7 +46,7 @@
  
  config ATH25
  	bool "Atheros AR231x/AR531x SoC support"
-@@ -1008,6 +1008,7 @@ config MIPS_PARAVIRT
+@@ -1009,6 +1009,7 @@ config MIPS_PARAVIRT
  endchoice
  
  source "arch/mips/alchemy/Kconfig"

+ 2 - 2
target/linux/generic/backport-4.9/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch

@@ -84,7 +84,7 @@ Signed-off-by: Masahiro Yamada <[email protected]>
 
 --- a/include/linux/compiler-gcc.h
 +++ b/include/linux/compiler-gcc.h
-@@ -338,3 +338,30 @@
+@@ -351,3 +351,30 @@
  #if GCC_VERSION >= 50100
  #define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
  #endif
@@ -117,7 +117,7 @@ Signed-off-by: Masahiro Yamada <[email protected]>
 +
 --- a/include/linux/compiler.h
 +++ b/include/linux/compiler.h
-@@ -578,4 +578,23 @@ static __always_inline void __write_once
+@@ -583,4 +583,23 @@ static __always_inline void __write_once
  # define __kprobes
  # define nokprobe_inline	inline
  #endif

+ 3 - 3
target/linux/generic/hack-4.9/220-gc_sections.patch

@@ -33,8 +33,8 @@ Signed-off-by: Gabor Juhos <[email protected]>
  # Read KERNELRELEASE from include/config/kernel.release (if it exists)
  KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
  KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
-@@ -649,11 +654,6 @@ KBUILD_CFLAGS	+= $(call cc-disable-warni
- KBUILD_CFLAGS	+= $(call cc-disable-warning, int-in-bool-context)
+@@ -650,11 +655,6 @@ KBUILD_CFLAGS	+= $(call cc-disable-warni
+ KBUILD_CFLAGS	+= $(call cc-disable-warning, address-of-packed-member)
  KBUILD_CFLAGS	+= $(call cc-disable-warning, attribute-alias)
  
 -ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION
@@ -171,7 +171,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
  	.init.data : {
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -55,6 +55,7 @@ config MIPS
+@@ -56,6 +56,7 @@ config MIPS
  	select CLONE_BACKWARDS
  	select HAVE_DEBUG_STACKOVERFLOW
  	select HAVE_CC_STACKPROTECTOR

+ 1 - 1
target/linux/generic/hack-4.9/301-mips_image_cmdline_hack.patch

@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1159,6 +1159,10 @@ config SYNC_R4K
+@@ -1160,6 +1160,10 @@ config SYNC_R4K
  config MIPS_MACHINE
  	def_bool n
  

+ 1 - 1
target/linux/generic/pending-4.9/201-extra_optimization.patch

@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -655,12 +655,12 @@ KBUILD_CFLAGS	+= $(call cc-option,-fdata
+@@ -656,12 +656,12 @@ KBUILD_CFLAGS	+= $(call cc-option,-fdata
  endif
  
  ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

+ 2 - 2
target/linux/generic/pending-4.9/300-mips_expose_boot_raw.patch

@@ -9,7 +9,7 @@ Acked-by: Rob Landley <[email protected]>
 ---
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1068,9 +1068,6 @@ config FW_ARC
+@@ -1069,9 +1069,6 @@ config FW_ARC
  config ARCH_MAY_HAVE_PC_FDC
  	bool
  
@@ -19,7 +19,7 @@ Acked-by: Rob Landley <[email protected]>
  config CEVT_BCM1480
  	bool
  
-@@ -2967,6 +2964,18 @@ choice
+@@ -2968,6 +2965,18 @@ choice
  		bool "Extend builtin kernel arguments with bootloader arguments"
  endchoice
  

+ 1 - 1
target/linux/generic/pending-4.9/304-mips_disable_fpu.patch

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

+ 6 - 6
target/linux/generic/pending-4.9/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch

@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -214,6 +214,7 @@ config BMIPS_GENERIC
+@@ -215,6 +215,7 @@ config BMIPS_GENERIC
  	select BRCMSTB_L2_IRQ
  	select IRQ_MIPS_CPU
  	select DMA_NONCOHERENT
@@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	select SYS_SUPPORTS_32BIT_KERNEL
  	select SYS_SUPPORTS_LITTLE_ENDIAN
  	select SYS_SUPPORTS_BIG_ENDIAN
-@@ -339,6 +340,7 @@ config MACH_JAZZ
+@@ -340,6 +341,7 @@ config MACH_JAZZ
  	select CSRC_R4K
  	select DEFAULT_SGI_PARTITION if CPU_BIG_ENDIAN
  	select GENERIC_ISA_DMA
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	select HAVE_PCSPKR_PLATFORM
  	select IRQ_MIPS_CPU
  	select I8253
-@@ -1129,6 +1131,9 @@ config DMA_NONCOHERENT
+@@ -1130,6 +1132,9 @@ config DMA_NONCOHERENT
  	bool
  	select NEED_DMA_MAP_STATE
  
@@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  config NEED_DMA_MAP_STATE
  	bool
  
-@@ -1653,6 +1658,7 @@ config CPU_R10000
+@@ -1654,6 +1659,7 @@ config CPU_R10000
  	select CPU_SUPPORTS_64BIT_KERNEL
  	select CPU_SUPPORTS_HIGHMEM
  	select CPU_SUPPORTS_HUGEPAGES
@@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	help
  	  MIPS Technologies R10000-series processors.
  
-@@ -1898,9 +1904,11 @@ config SYS_HAS_CPU_MIPS32_R3_5
+@@ -1899,9 +1905,11 @@ config SYS_HAS_CPU_MIPS32_R3_5
  	bool
  
  config SYS_HAS_CPU_MIPS32_R5
@@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	bool
  
  config SYS_HAS_CPU_MIPS64_R1
-@@ -1910,6 +1918,7 @@ config SYS_HAS_CPU_MIPS64_R2
+@@ -1911,6 +1919,7 @@ config SYS_HAS_CPU_MIPS64_R2
  	bool
  
  config SYS_HAS_CPU_MIPS64_R6

+ 4 - 4
target/linux/generic/pending-4.9/630-packet_socket_type.patch

@@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	if (!net_eq(dev_net(dev), sock_net(sk)))
  		goto drop;
  
-@@ -3270,6 +3272,7 @@ static int packet_create(struct net *net
+@@ -3284,6 +3286,7 @@ static int packet_create(struct net *net
  	mutex_init(&po->pg_vec_lock);
  	po->rollover = NULL;
  	po->prot_hook.func = packet_rcv;
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  
  	if (sock->type == SOCK_PACKET)
  		po->prot_hook.func = packet_rcv_spkt;
-@@ -3883,6 +3886,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3897,6 +3900,16 @@ packet_setsockopt(struct socket *sock, i
  		po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
  		return 0;
  	}
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	default:
  		return -ENOPROTOOPT;
  	}
-@@ -3935,6 +3948,13 @@ static int packet_getsockopt(struct sock
+@@ -3949,6 +3962,13 @@ static int packet_getsockopt(struct sock
  	case PACKET_VNET_HDR:
  		val = po->has_vnet_hdr;
  		break;
@@ -128,7 +128,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  		break;
 --- a/net/packet/internal.h
 +++ b/net/packet/internal.h
-@@ -128,6 +128,7 @@ struct packet_sock {
+@@ -129,6 +129,7 @@ struct packet_sock {
  	struct net_device __rcu	*cached_dev;
  	int			(*xmit)(struct sk_buff *skb);
  	struct packet_type	prot_hook ____cacheline_aligned_in_smp;

+ 4 - 4
target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch

@@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	if (!(skb->dev->features & NETIF_F_GRO))
  		goto normal;
  
-@@ -5864,6 +5867,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -5867,6 +5870,48 @@ static void __netdev_adjacent_dev_unlink
  					   &upper_dev->adj_list.lower);
  }
  
@@ -93,7 +93,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  static int __netdev_upper_dev_link(struct net_device *dev,
  				   struct net_device *upper_dev, bool master,
  				   void *upper_priv, void *upper_info)
-@@ -5936,6 +5981,7 @@ static int __netdev_upper_dev_link(struc
+@@ -5939,6 +5984,7 @@ static int __netdev_upper_dev_link(struc
  			goto rollback_lower_mesh;
  	}
  
@@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
  					    &changeupper_info.info);
  	ret = notifier_to_errno(ret);
-@@ -6062,6 +6108,7 @@ void netdev_upper_dev_unlink(struct net_
+@@ -6065,6 +6111,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);
  
@@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
  				      &changeupper_info.info);
  }
-@@ -6664,6 +6711,7 @@ int dev_set_mac_address(struct net_devic
+@@ -6667,6 +6714,7 @@ int dev_set_mac_address(struct net_devic
  	if (err)
  		return err;
  	dev->addr_assign_type = NET_ADDR_SET;

+ 2 - 2
target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch

@@ -105,7 +105,7 @@
  	case UPIO_AU:
  		p->serial_out(p, offset, value);
  		p->serial_in(p, UART_LCR);	/* safe, no side-effects */
-@@ -2759,6 +2779,7 @@ static int serial8250_request_std_resour
+@@ -2758,6 +2778,7 @@ static int serial8250_request_std_resour
  	case UPIO_MEM32BE:
  	case UPIO_MEM16:
  	case UPIO_MEM:
@@ -113,7 +113,7 @@
  		if (!port->mapbase)
  			break;
  
-@@ -2797,6 +2818,7 @@ static void serial8250_release_std_resou
+@@ -2796,6 +2817,7 @@ static void serial8250_release_std_resou
  	case UPIO_MEM32BE:
  	case UPIO_MEM16:
  	case UPIO_MEM: