drop revert of commit we dont have

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

3 files changed, 12 insertions, 60 deletions

diff --git a/queue/Revert-exec-avoid-RLIMIT_STACK-races-with-prlimit.patch b/queue/Revert-exec-avoid-RLIMIT_STACK-races-with-prlimit.patch
deleted file mode 100644
index 85cdaec..0000000
--- a/queue/Revert-exec-avoid-RLIMIT_STACK-races-with-prlimit.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 779f4e1c6c7c661db40dfebd6dd6bda7b5f88aa3 Mon Sep 17 00:00:00 2001
-From: Kees Cook <keescook@chromium.org>
-Date: Tue, 12 Dec 2017 11:28:38 -0800
-Subject: [PATCH] Revert "exec: avoid RLIMIT_STACK races with prlimit()"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit 779f4e1c6c7c661db40dfebd6dd6bda7b5f88aa3 upstream.
-
-This reverts commit 04e35f4495dd560db30c25efca4eecae8ec8c375.
-
-SELinux runs with secureexec for all non-"noatsecure" domain transitions,
-which means lots of processes end up hitting the stack hard-limit change
-that was introduced in order to fix a race with prlimit(). That race fix
-will need to be redesigned.
-
-Reported-by: Laura Abbott <labbott@redhat.com>
-Reported-by: Tomáš Trnka <trnka@scm.com>
-Cc: stable@vger.kernel.org
-Signed-off-by: Kees Cook <keescook@chromium.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-
-diff --git a/fs/exec.c b/fs/exec.c
-index 156f56acfe8e..5688b5e1b937 100644
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -1339,15 +1339,10 @@ void setup_new_exec(struct linux_binprm * bprm)
- 		 * avoid bad behavior from the prior rlimits. This has to
- 		 * happen before arch_pick_mmap_layout(), which examines
- 		 * RLIMIT_STACK, but after the point of no return to avoid
--		 * races from other threads changing the limits. This also
--		 * must be protected from races with prlimit() calls.
-+		 * needing to clean up the change on failure.
- 		 */
--		task_lock(current->group_leader);
- 		if (current->signal->rlim[RLIMIT_STACK].rlim_cur > _STK_LIM)
- 			current->signal->rlim[RLIMIT_STACK].rlim_cur = _STK_LIM;
--		if (current->signal->rlim[RLIMIT_STACK].rlim_max > _STK_LIM)
--			current->signal->rlim[RLIMIT_STACK].rlim_max = _STK_LIM;
--		task_unlock(current->group_leader);
- 	}
- 
- 	arch_pick_mmap_layout(current->mm);
--- 
-2.15.0
-
diff --git a/queue/dmaengine-dmatest-move-callback-wait-queue-to-thread.patch b/queue/dmaengine-dmatest-move-callback-wait-queue-to-thread.patch
index 8f16c10..dadf92c 100644
--- a/queue/dmaengine-dmatest-move-callback-wait-queue-to-thread.patch
+++ b/queue/dmaengine-dmatest-move-callback-wait-queue-to-thread.patch
@@ -1,4 +1,4 @@
-From 6f6a23a213be51728502b88741ba6a10cda2441d Mon Sep 17 00:00:00 2001
+From 79f36f33a29f5f9ca0f21e301e3cc9ec2725332f Mon Sep 17 00:00:00 2001
 From: Adam Wallis <awallis@codeaurora.org>
 Date: Mon, 27 Nov 2017 10:45:01 -0500
 Subject: [PATCH] dmaengine: dmatest: move callback wait queue to thread
@@ -28,14 +28,15 @@ Reviewed-by: Sinan Kaya <okaya@codeaurora.org>
 Suggested-by: Shunyong Yang <shunyong.yang@hxt-semitech.com>
 Signed-off-by: Adam Wallis <awallis@codeaurora.org>
 Signed-off-by: Vinod Koul <vinod.koul@intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
-index 47edc7fbf91f..ec5f9d2bc820 100644
+index 2b478224532e..68e4be599cb8 100644
 --- a/drivers/dma/dmatest.c
 +++ b/drivers/dma/dmatest.c
-@@ -155,6 +155,12 @@ MODULE_PARM_DESC(run, "Run the test (default: false)");
+@@ -159,6 +159,12 @@ MODULE_PARM_DESC(run, "Run the test (default: false)");
+ #define PATTERN_OVERWRITE	0x20
  #define PATTERN_COUNT_MASK	0x1f
- #define PATTERN_MEMSET_IDX	0x01
  
 +/* poor man's completion - we want to use wait_event_freezable() on it */
 +struct dmatest_done {
@@ -46,7 +47,7 @@ index 47edc7fbf91f..ec5f9d2bc820 100644
  struct dmatest_thread {
  	struct list_head	node;
  	struct dmatest_info	*info;
-@@ -165,6 +171,8 @@ struct dmatest_thread {
+@@ -169,6 +175,8 @@ struct dmatest_thread {
  	u8			**dsts;
  	u8			**udsts;
  	enum dma_transaction_type type;
@@ -55,7 +56,7 @@ index 47edc7fbf91f..ec5f9d2bc820 100644
  	bool			done;
  };
  
-@@ -342,18 +350,25 @@ static unsigned int dmatest_verify(u8 **bufs, unsigned int start,
+@@ -329,18 +337,25 @@ static unsigned int dmatest_verify(u8 **bufs, unsigned int start,
  	return error_count;
  }
  
@@ -89,7 +90,7 @@ index 47edc7fbf91f..ec5f9d2bc820 100644
  }
  
  static unsigned int min_odd(unsigned int x, unsigned int y)
-@@ -424,9 +439,8 @@ static unsigned long long dmatest_KBs(s64 runtime, unsigned long long len)
+@@ -411,9 +426,8 @@ static unsigned long long dmatest_KBs(s64 runtime, unsigned long long len)
   */
  static int dmatest_func(void *data)
  {
@@ -100,7 +101,7 @@ index 47edc7fbf91f..ec5f9d2bc820 100644
  	struct dmatest_info	*info;
  	struct dmatest_params	*params;
  	struct dma_chan		*chan;
-@@ -673,9 +687,9 @@ static int dmatest_func(void *data)
+@@ -667,9 +681,9 @@ static int dmatest_func(void *data)
  			continue;
  		}
  
@@ -112,7 +113,7 @@ index 47edc7fbf91f..ec5f9d2bc820 100644
  		cookie = tx->tx_submit(tx);
  
  		if (dma_submit_error(cookie)) {
-@@ -688,21 +702,12 @@ static int dmatest_func(void *data)
+@@ -682,21 +696,12 @@ static int dmatest_func(void *data)
  		}
  		dma_async_issue_pending(chan);
  
@@ -136,7 +137,7 @@ index 47edc7fbf91f..ec5f9d2bc820 100644
  			dmaengine_unmap_put(um);
  			result("test timed out", total_tests, src_off, dst_off,
  			       len, 0);
-@@ -789,7 +794,7 @@ static int dmatest_func(void *data)
+@@ -781,7 +786,7 @@ static int dmatest_func(void *data)
  		dmatest_KBs(runtime, total_len), ret);
  
  	/* terminate all transfers on specified channels */
@@ -145,7 +146,7 @@ index 47edc7fbf91f..ec5f9d2bc820 100644
  		dmaengine_terminate_all(chan);
  
  	thread->done = true;
-@@ -849,6 +854,8 @@ static int dmatest_add_threads(struct dmatest_info *info,
+@@ -841,6 +846,8 @@ static int dmatest_add_threads(struct dmatest_info *info,
  		thread->info = info;
  		thread->chan = dtc->chan;
  		thread->type = type;
diff --git a/queue/series b/queue/series
index 05ed326..1afa5dd 100644
--- a/queue/series
+++ b/queue/series
@@ -17,9 +17,7 @@ scsi-core-Fix-a-scsi_show_rq-NULL-pointer-dereferenc.patch
 dm-fix-various-targets-to-dm_register_target-after-m.patch
 iw_cxgb4-only-insert-drain-cqes-if-wq-is-flushed.patch
 eeprom-at24-change-nvmem-stride-to-1.patch
-posix-timer-Properly-check-sigevent-sigev_notify.patch
 dmaengine-dmatest-move-callback-wait-queue-to-thread.patch
-Revert-exec-avoid-RLIMIT_STACK-races-with-prlimit.patch
 ext4-fix-fdatasync-2-after-fallocate-2-operation.patch
 ext4-add-missing-error-check-in-__ext4_new_inode.patch
 ext4-fix-crash-when-a-directory-s-i_size-is-too-smal.patch