drop queue-3.18/staging-android-ion-add-__gfp_nowarn-for-system-contig-heap.patch

diff --git a/queue-3.18/series b/queue-3.18/series
index 6d5f8d60c3a812bcacc9c6856c6e4010d7b638cf..caee2edf7a6449f46b624a2f233fcc2050b19f03 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -19,7 +19,6 @@ mm-vmscan-make-unregister_shrinker-no-op-if-register_shrinker-failed.patch
 xfrm-check-id-proto-in-validate_tmpl.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
 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
 netfilter-ipt_clusterip-fix-out-of-bounds-accesses-in-clusterip_tg_check.patch

diff --git a/queue-3.18/staging-android-ion-add-__gfp_nowarn-for-system-contig-heap.patch b/queue-3.18/staging-android-ion-add-__gfp_nowarn-for-system-contig-heap.patch
deleted file mode 100644 (file)
index 0cbb6eb..0000000
--- a/queue-3.18/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
-@@ -321,7 +321,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;
-