Merge 5.15.98 into android13-5.15-lts
Changes in 5.15.98
io_uring: ensure that io_init_req() passes in the right issue_flags
Linux 5.15.98
Change-Id: Ia3486a74c34db373abb65cb2c48f37a5b809aa2e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
diff --git a/Makefile b/Makefile
index 553e56d..34828e2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 15
-SUBLEVEL = 97
+SUBLEVEL = 98
EXTRAVERSION =
NAME = Trick or Treat
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 7857b3d..51d6fbe 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -7310,7 +7310,8 @@
if (io_op_defs[req->opcode].needs_file) {
req->file = io_file_get(ctx, req, READ_ONCE(sqe->fd),
- (sqe_flags & IOSQE_FIXED_FILE), 0);
+ (sqe_flags & IOSQE_FIXED_FILE),
+ IO_URING_F_NONBLOCK);
if (unlikely(!req->file))
ret = -EBADF;
}
