* [PATCH] [linux-5.10.y] io_uring: fix splice_fd_in checks backport typo
@ 2021-10-18 17:18 Kamal Mostafa
2021-10-18 18:47 ` Jens Axboe
0 siblings, 1 reply; 3+ messages in thread
From: Kamal Mostafa @ 2021-10-18 17:18 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Kamal Mostafa, stable, Alexander Viro, Jens Axboe,
Pavel Begunkov, linux-fsdevel, io-uring, linux-kernel
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 <gregkh@linuxfoundation.org>
Cc: stable@vger.kernel.org # v5.10
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] [linux-5.10.y] io_uring: fix splice_fd_in checks backport typo
2021-10-18 17:18 [PATCH] [linux-5.10.y] io_uring: fix splice_fd_in checks backport typo Kamal Mostafa
@ 2021-10-18 18:47 ` Jens Axboe
2021-10-20 12:38 ` Greg Kroah-Hartman
0 siblings, 1 reply; 3+ messages in thread
From: Jens Axboe @ 2021-10-18 18:47 UTC (permalink / raw)
To: Kamal Mostafa, Greg Kroah-Hartman
Cc: stable, Alexander Viro, Pavel Begunkov, linux-fsdevel, io-uring,
linux-kernel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] [linux-5.10.y] io_uring: fix splice_fd_in checks backport typo
2021-10-18 18:47 ` Jens Axboe
@ 2021-10-20 12:38 ` Greg Kroah-Hartman
0 siblings, 0 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2021-10-20 12:38 UTC (permalink / raw)
To: Jens Axboe
Cc: Kamal Mostafa, stable, Alexander Viro, Pavel Begunkov,
linux-fsdevel, io-uring, linux-kernel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-20 12:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-18 17:18 [PATCH] [linux-5.10.y] io_uring: fix splice_fd_in checks backport typo Kamal Mostafa
2021-10-18 18:47 ` Jens Axboe
2021-10-20 12:38 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).