2021-10-18 17:19:50

by Kamal Mostafa

Subject: [PATCH] [linux-5.10.y] io_uring: fix splice_fd_in checks backport typo

The linux-5.10.y backport of commit "io_uring: add ->splice_fd_in checks"
includes a typo: "|" where "||" should be. (The original upstream commit
is fine.)

Fixes: 54eb6211b979 ("io_uring: add ->splice_fd_in checks")
Cc: Greg Kroah-Hartman <[email protected]>
Cc: [email protected] # v5.10
Signed-off-by: Kamal Mostafa <[email protected]>
---
fs/io_uring.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 26753d0cb431..0736487165da 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -5559,7 +5559,7 @@ static int io_timeout_remove_prep(struct io_kiocb *req,
return -EINVAL;
if (unlikely(req->flags & (REQ_F_FIXED_FILE | REQ_F_BUFFER_SELECT)))
return -EINVAL;
- if (sqe->ioprio || sqe->buf_index || sqe->len || sqe->timeout_flags |
+ if (sqe->ioprio || sqe->buf_index || sqe->len || sqe->timeout_flags ||
sqe->splice_fd_in)
return -EINVAL;

--
2.17.1

2021-10-18 18:51:46

by Jens Axboe

Subject: Re: [PATCH] [linux-5.10.y] io_uring: fix splice_fd_in checks backport typo

On 10/18/21 11:18 AM, Kamal Mostafa wrote:
> The linux-5.10.y backport of commit "io_uring: add ->splice_fd_in checks"
> includes a typo: "|" where "||" should be. (The original upstream commit
> is fine.)

Oops indeed! Greg, can you queue this one up?

--
Jens Axboe

2021-10-20 12:41:23

by Greg KH

Subject: Re: [PATCH] [linux-5.10.y] io_uring: fix splice_fd_in checks backport typo

On Mon, Oct 18, 2021 at 12:47:17PM -0600, Jens Axboe wrote:
> On 10/18/21 11:18 AM, Kamal Mostafa wrote:
> > The linux-5.10.y backport of commit "io_uring: add ->splice_fd_in checks"
> > includes a typo: "|" where "||" should be. (The original upstream commit
> > is fine.)
>
> Oops indeed! Greg, can you queue this one up?

Sure, now done.

greg k-h