2
0
Эх сурвалжийг харах

kernel: bump 4.9 to 4.9.145

Refreshed all patches.

Fixes CVE:
- CVE-2018-14625

Compile-tested on: brcm2708
Runtime-tested on: brcm2708

Signed-off-by: Koen Vandeputte <[email protected]>
Tested-by: Stijn Tintel <[email protected]>
Koen Vandeputte 7 жил өмнө
parent
commit
fd918b413a

+ 2 - 2
include/kernel-version.mk

@@ -3,11 +3,11 @@
 LINUX_RELEASE?=1
 
 LINUX_VERSION-3.18 = .129
-LINUX_VERSION-4.9 = .144
+LINUX_VERSION-4.9 = .145
 LINUX_VERSION-4.14 = .87
 
 LINUX_KERNEL_HASH-3.18.129 = 8d420b58593a74109175be781da2320a341baec9aaa186da31ad508d3f377e72
-LINUX_KERNEL_HASH-4.9.144 = 05d17f434d22e9fa2f9084cdf6858383564883d23a1d11ce4dae4b217662782b
+LINUX_KERNEL_HASH-4.9.145 = 6901ca37e8c305a2f26c598952338b4dc2481ca5a9d0bf71e2b71730a5b5bc5e
 LINUX_KERNEL_HASH-4.14.87 = 36744d7d657dab23e455a8096e4ad2dc6a25f25fdce062d8a8bdf4499112e125
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))

+ 1 - 1
target/linux/brcm2708/patches-4.9/950-0028-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch

@@ -9,7 +9,7 @@ Subject: [PATCH] kbuild: Ignore dtco targets when filtering symbols
 
 --- a/scripts/Kbuild.include
 +++ b/scripts/Kbuild.include
-@@ -295,7 +295,7 @@ ksym_dep_filter =
+@@ -296,7 +296,7 @@ ksym_dep_filter =
  	    $(CPP) $(call flags_nodeps,c_flags) -D__KSYM_DEPS__ $< ;;        \
  	  as_*_S|cpp_s_S)                                                    \
  	    $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;;        \

+ 1 - 1
target/linux/generic/backport-4.9/040-mm-add-support-for-releasing-multiple-instances-of-a.patch

@@ -52,7 +52,7 @@ Signed-off-by: Linus Torvalds <[email protected]>
  extern void __free_page_frag(void *addr);
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -3945,6 +3945,20 @@ static struct page *__page_frag_refill(s
+@@ -3935,6 +3935,20 @@ static struct page *__page_frag_refill(s
  	return page;
  }
  

+ 2 - 2
target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch

@@ -63,7 +63,7 @@ Signed-off-by: Linus Torvalds <[email protected]>
  void *napi_alloc_frag(unsigned int fragsz);
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -3959,8 +3959,8 @@ void __page_frag_drain(struct page *page
+@@ -3949,8 +3949,8 @@ void __page_frag_drain(struct page *page
  }
  EXPORT_SYMBOL(__page_frag_drain);
  
@@ -74,7 +74,7 @@ Signed-off-by: Linus Torvalds <[email protected]>
  {
  	unsigned int size = PAGE_SIZE;
  	struct page *page;
-@@ -4011,19 +4011,19 @@ refill:
+@@ -4001,19 +4001,19 @@ refill:
  
  	return nc->va + offset;
  }

+ 3 - 3
target/linux/generic/backport-4.9/042-mm-rename-__page_frag-functions-to-__page_frag_cache.patch

@@ -33,7 +33,7 @@ Signed-off-by: Linus Torvalds <[email protected]>
  extern void page_frag_free(void *addr);
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -3924,8 +3924,8 @@ EXPORT_SYMBOL(free_pages);
+@@ -3914,8 +3914,8 @@ EXPORT_SYMBOL(free_pages);
   * drivers to provide a backing region of memory for use as either an
   * sk_buff->head, or to be used in the "frags" portion of skb_shared_info.
   */
@@ -44,7 +44,7 @@ Signed-off-by: Linus Torvalds <[email protected]>
  {
  	struct page *page = NULL;
  	gfp_t gfp = gfp_mask;
-@@ -3945,19 +3945,20 @@ static struct page *__page_frag_refill(s
+@@ -3935,19 +3935,20 @@ static struct page *__page_frag_refill(s
  	return page;
  }
  
@@ -68,7 +68,7 @@ Signed-off-by: Linus Torvalds <[email protected]>
  
  void *page_frag_alloc(struct page_frag_cache *nc,
  		      unsigned int fragsz, gfp_t gfp_mask)
-@@ -3968,7 +3969,7 @@ void *page_frag_alloc(struct page_frag_c
+@@ -3958,7 +3959,7 @@ void *page_frag_alloc(struct page_frag_c
  
  	if (unlikely(!nc->va)) {
  refill:

+ 1 - 1
target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch

@@ -192,7 +192,7 @@ Signed-off-by: David S. Miller <[email protected]>
  
 --- a/drivers/net/can/rcar/rcar_can.c
 +++ b/drivers/net/can/rcar/rcar_can.c
-@@ -695,7 +695,7 @@ static int rcar_can_rx_poll(struct napi_
+@@ -698,7 +698,7 @@ static int rcar_can_rx_poll(struct napi_
  	}
  	/* All packets processed */
  	if (num_pkts < quota) {

+ 2 - 2
target/linux/generic/hack-4.9/207-disable-modorder.patch

@@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -1229,7 +1229,6 @@ all: modules
+@@ -1231,7 +1231,6 @@ all: modules
  
  PHONY += modules
  modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
@@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	@$(kecho) '  Building modules, stage 2.';
  	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
  	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
-@@ -1259,7 +1258,6 @@ _modinst_:
+@@ -1261,7 +1260,6 @@ _modinst_:
  		rm -f $(MODLIB)/build ; \
  		ln -s $(CURDIR) $(MODLIB)/build ; \
  	fi

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

@@ -33,7 +33,7 @@ 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)
-@@ -671,11 +676,6 @@ KBUILD_CFLAGS	+= $(call cc-disable-warni
+@@ -673,11 +678,6 @@ KBUILD_CFLAGS	+= $(call cc-disable-warni
  KBUILD_CFLAGS	+= $(call cc-disable-warning, int-in-bool-context)
  KBUILD_CFLAGS	+= $(call cc-disable-warning, attribute-alias)
  

+ 1 - 1
target/linux/generic/pending-4.9/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch

@@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <[email protected]>
 
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -5932,7 +5932,7 @@ static void __ref alloc_node_mem_map(str
+@@ -5922,7 +5922,7 @@ static void __ref alloc_node_mem_map(str
  		mem_map = NODE_DATA(0)->node_mem_map;
  #if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM)
  		if (page_to_pfn(mem_map) != pgdat->node_start_pfn)

+ 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
-@@ -678,12 +678,12 @@ endif
+@@ -680,12 +680,12 @@ endif
  
  ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
  KBUILD_CFLAGS	+= $(call cc-option,-Oz,-Os)