4.4-stable patches

added patches:
	net-dst_cache_per_cpu_dst_set-can-be-static.patch

diff --git a/queue-4.4/net-dst_cache_per_cpu_dst_set-can-be-static.patch b/queue-4.4/net-dst_cache_per_cpu_dst_set-can-be-static.patch
new file mode 100644 (file)
index 0000000..2a8962f
--- /dev/null
+++ b/queue-4.4/net-dst_cache_per_cpu_dst_set-can-be-static.patch
@@ -0,0 +1,41 @@
+From b73f96fcb49ec90c2f837719893e7b25fcdf08d8 Mon Sep 17 00:00:00 2001
+From: Wu Fengguang <fengguang.wu@intel.com>
+Date: Fri, 18 Mar 2016 23:27:28 +0800
+Subject: net: dst_cache_per_cpu_dst_set() can be static
+
+From: Wu Fengguang <fengguang.wu@intel.com>
+
+commit b73f96fcb49ec90c2f837719893e7b25fcdf08d8 upstream.
+
+Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/core/dst_cache.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/net/core/dst_cache.c
++++ b/net/core/dst_cache.c
+@@ -28,8 +28,8 @@ struct dst_cache_pcpu {
+       };
+ };
+ 
+-void dst_cache_per_cpu_dst_set(struct dst_cache_pcpu *dst_cache,
+-                             struct dst_entry *dst, u32 cookie)
++static void dst_cache_per_cpu_dst_set(struct dst_cache_pcpu *dst_cache,
++                                    struct dst_entry *dst, u32 cookie)
+ {
+       dst_release(dst_cache->dst);
+       if (dst)
+@@ -39,8 +39,8 @@ void dst_cache_per_cpu_dst_set(struct ds
+       dst_cache->dst = dst;
+ }
+ 
+-struct dst_entry *dst_cache_per_cpu_get(struct dst_cache *dst_cache,
+-                                      struct dst_cache_pcpu *idst)
++static struct dst_entry *dst_cache_per_cpu_get(struct dst_cache *dst_cache,
++                                             struct dst_cache_pcpu *idst)
+ {
+       struct dst_entry *dst;
+ 

diff --git a/queue-4.4/series b/queue-4.4/series
index 4cd715b327f9e23318031342062552817ec4d46f..f93b2ab50a63cef87bbb27cac682a98b85e75a9b 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -10,7 +10,6 @@ provide-a-function-to-create-a-nul-terminated-string-from-unterminated-data.patc
 selinux-ensure-the-context-is-nul-terminated-in-security_context_to_sid_core.patch
 selinux-skip-bounded-transition-processing-if-the-policy-isn-t-loaded.patch
 crypto-x86-twofish-3way-fix-rbp-usage.patch
-staging-android-ion-add-__gfp_nowarn-for-system-contig-heap.patch
 kvm-x86-fix-escape-of-guest-dr6-to-the-host.patch
 netfilter-x_tables-fix-int-overflow-in-xt_alloc_table_info.patch
 netfilter-x_tables-avoid-out-of-bounds-reads-in-xt_request_find_-match-target.patch
@@ -191,3 +190,4 @@ kvm-nvmx-fix-kernel-panics-induced-by-illegal-invept-invvpid-types.patch
 kvm-vmx-clean-up-declaration-of-vpid-ept-invalidation-types.patch
 kvm-nvmx-invvpid-handling-improvements.patch
 crypto-s5p-sss-fix-kernel-oops-in-aes-ecb-mode.patch
+net-dst_cache_per_cpu_dst_set-can-be-static.patch

diff --git a/queue-4.4/staging-android-ion-add-__gfp_nowarn-for-system-contig-heap.patch b/queue-4.4/staging-android-ion-add-__gfp_nowarn-for-system-contig-heap.patch
deleted file mode 100644 (file)
index 9854745..0000000
--- a/queue-4.4/staging-android-ion-add-__gfp_nowarn-for-system-contig-heap.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 0c75f10312a35b149b2cebb1832316b35c2337ca Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Fri, 5 Jan 2018 11:14:08 -0800
-Subject: staging: android: ion: Add __GFP_NOWARN for system contig heap
-
-From: Laura Abbott <labbott@redhat.com>
-
-commit 0c75f10312a35b149b2cebb1832316b35c2337ca upstream.
-
-syzbot reported a warning from Ion:
-
-  WARNING: CPU: 1 PID: 3485 at mm/page_alloc.c:3926
-
-  ...
-   __alloc_pages_nodemask+0x9fb/0xd80 mm/page_alloc.c:4252
-  alloc_pages_current+0xb6/0x1e0 mm/mempolicy.c:2036
-  alloc_pages include/linux/gfp.h:492 [inline]
-  ion_system_contig_heap_allocate+0x40/0x2c0
-  drivers/staging/android/ion/ion_system_heap.c:374
-  ion_buffer_create drivers/staging/android/ion/ion.c:93 [inline]
-  ion_alloc+0x2c1/0x9e0 drivers/staging/android/ion/ion.c:420
-  ion_ioctl+0x26d/0x380 drivers/staging/android/ion/ion-ioctl.c:84
-  vfs_ioctl fs/ioctl.c:46 [inline]
-  do_vfs_ioctl+0x1b1/0x1520 fs/ioctl.c:686
-  SYSC_ioctl fs/ioctl.c:701 [inline]
-  SyS_ioctl+0x8f/0xc0 fs/ioctl.c:692
-
-This is a warning about attempting to allocate order > MAX_ORDER. This
-is coming from a userspace Ion allocation request. Since userspace is
-free to request however much memory it wants (and the kernel is free to
-deny its allocation), silence the allocation attempt with __GFP_NOWARN
-in case it fails.
-
-Reported-by: syzbot+76e7efc4748495855a4d@syzkaller.appspotmail.com
-Reported-by: syzbot <syzkaller@googlegroups.com>
-Signed-off-by: Laura Abbott <labbott@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/staging/android/ion/ion_system_heap.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/staging/android/ion/ion_system_heap.c
-+++ b/drivers/staging/android/ion/ion_system_heap.c
-@@ -336,7 +336,7 @@ static int ion_system_contig_heap_alloca
-       if (align > (PAGE_SIZE << order))
-               return -EINVAL;
- 
--      page = alloc_pages(low_order_gfp_flags, order);
-+      page = alloc_pages(low_order_gfp_flags | __GFP_NOWARN, order);
-       if (!page)
-               return -ENOMEM;
-