aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-12-13 11:43:25 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-12-14 13:04:54 +0100
commit85f42a74d3fb745422b5338aa370ee414a632b32 (patch)
tree390f60952ebd125cd972a0432c4e53d16e293749 /target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch
parent6f74e269c86c7aaec44edb5de0e122bebf54c71f (diff)
downloadupstream-85f42a74d3fb745422b5338aa370ee414a632b32.tar.gz
upstream-85f42a74d3fb745422b5338aa370ee414a632b32.tar.bz2
upstream-85f42a74d3fb745422b5338aa370ee414a632b32.zip
kernel: bump 4.9 to 4.9.145
Refreshed all patches. Fixes CVE: - CVE-2018-14625 Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch')
-rw-r--r--target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch b/target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch
index ddf10eb6dd..d1da94b4e6 100644
--- a/target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch
+++ b/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 <torvalds@linux-foundation.org>
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 <torvalds@linux-foundation.org>
{
unsigned int size = PAGE_SIZE;
struct page *page;
-@@ -4011,19 +4011,19 @@ refill:
+@@ -4001,19 +4001,19 @@ refill:
return nc->va + offset;
}