drop workqueue patch from 3.18

diff --git a/queue-3.18/series b/queue-3.18/series
index faacf72af0f26bd270a19c60446ca17d2d9ba857..738c4470569e2a94f4e31da6aa6c6363a83f6e90 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -14,7 +14,6 @@ input-mpr121-handle-multiple-bits-change-of-status-register.patch
 input-mpr121-set-missing-event-capability.patch
 ib-ipoib-change-list_del-to-list_del_init-in-the-tx-object.patch
 keys-trusted-sanitize-all-key-material.patch
-workqueue-fix-null-pointer-dereference.patch
 crypto-x86-sha1-mb-fix-panic-due-to-unaligned-access.patch
 keys-fix-null-pointer-dereference-during-asn.1-parsing.patch
 arm-8720-1-ensure-dump_instr-checks-addr_limit.patch

diff --git a/queue-3.18/workqueue-fix-null-pointer-dereference.patch b/queue-3.18/workqueue-fix-null-pointer-dereference.patch
deleted file mode 100644 (file)
index 112bcad..0000000
--- a/queue-3.18/workqueue-fix-null-pointer-dereference.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From cef572ad9bd7f85035ba8272e5352040e8be0152 Mon Sep 17 00:00:00 2001
-From: Li Bin <huawei.libin@huawei.com>
-Date: Sat, 28 Oct 2017 11:07:28 +0800
-Subject: workqueue: Fix NULL pointer dereference
-
-From: Li Bin <huawei.libin@huawei.com>
-
-commit cef572ad9bd7f85035ba8272e5352040e8be0152 upstream.
-
-When queue_work() is used in irq (not in task context), there is
-a potential case that trigger NULL pointer dereference.
-----------------------------------------------------------------
-worker_thread()
-|-spin_lock_irq()
-|-process_one_work()
-       |-worker->current_pwq = pwq
-       |-spin_unlock_irq()
-       |-worker->current_func(work)
-       |-spin_lock_irq()
-       |-worker->current_pwq = NULL
-|-spin_unlock_irq()
-
-                               //interrupt here
-                               |-irq_handler
-                                       |-__queue_work()
-                                               //assuming that the wq is draining
-                                               |-is_chained_work(wq)
-                                                       |-current_wq_worker()
-                                                       //Here, 'current' is the interrupted worker!
-                                                               |-current->current_pwq is NULL here!
-|-schedule()
-----------------------------------------------------------------
-
-Avoid it by checking for task context in current_wq_worker(), and
-if not in task context, we shouldn't use the 'current' to check the
-condition.
-
-Reported-by: Xiaofei Tan <tanxiaofei@huawei.com>
-Signed-off-by: Li Bin <huawei.libin@huawei.com>
-Reviewed-by: Lai Jiangshan <jiangshanlai@gmail.com>
-Signed-off-by: Tejun Heo <tj@kernel.org>
-Fixes: 8d03ecfe4718 ("workqueue: reimplement is_chained_work() using current_wq_worker()")
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- kernel/workqueue_internal.h |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/kernel/workqueue_internal.h
-+++ b/kernel/workqueue_internal.h
-@@ -9,6 +9,7 @@
- 
- #include <linux/workqueue.h>
- #include <linux/kthread.h>
-+#include <linux/preempt.h>
- 
- struct worker_pool;
- 
-@@ -59,7 +60,7 @@ struct worker {
-  */
- static inline struct worker *current_wq_worker(void)
- {
--      if (current->flags & PF_WQ_WORKER)
-+      if (in_task() && (current->flags & PF_WQ_WORKER))
-               return kthread_data(current);
-       return NULL;
- }