anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 5.15.98 into android13-5.15-lts

Browse Source 
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>
This commit is contained in:
Greg Kroah-Hartman
2023-03-24 16:36:30 +00:00
parent 55048c11a8 d9b4a0c83a
commit fa7bbebb18
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 15
SUBLEVEL = 97
SUBLEVEL = 98
EXTRAVERSION =
NAME = Trick or Treat

3
io_uring/io_uring.c
View File

@@ -7310,7 +7310,8 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req,
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;
}