From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 19 Jan 2020 13:20:34 +0000 (+0100)
Subject: 5.4: fix up io_uring patch
X-Git-Tag: v4.4.211~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c8bd797ae84f60957b63d3c6cac2761b9187368;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4: fix up io_uring patch
---

diff --git a/queue-5.4/io_uring-only-allow-submit-from-owning-task.patch b/queue-5.4/io_uring-only-allow-submit-from-owning-task.patch
index bbcc47b4ce3..54e688d4720 100644
--- a/queue-5.4/io_uring-only-allow-submit-from-owning-task.patch
+++ b/queue-5.4/io_uring-only-allow-submit-from-owning-task.patch
@@ -18,16 +18,17 @@ Suggested-by: Stefan Metzmacher <metze@samba.org>
 Signed-off-by: Jens Axboe <axboe@kernel.dk>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
+
 ---
  fs/io_uring.c |    6 ++++++
  1 file changed, 6 insertions(+)
 
 --- a/fs/io_uring.c
 +++ b/fs/io_uring.c
-@@ -2798,6 +2798,12 @@ static int io_sq_thread(void *data)
- 			}
- 		}
- 
+@@ -3716,6 +3716,12 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned
+ 			wake_up(&ctx->sqo_wait);
+ 		submitted = to_submit;
+ 	} else if (to_submit) {
 +		if (current->mm != ctx->sqo_mm ||
 +		    current_cred() != ctx->creds) {
 +			ret = -EPERM;
@@ -35,5 +36,5 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +		}
 +
  		to_submit = min(to_submit, ctx->sq_entries);
- 		inflight += io_submit_sqes(ctx, to_submit, cur_mm != NULL,
- 					   mm_fault);
+ 
+ 		mutex_lock(&ctx->uring_lock);