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;
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
linux-stable-mirror@lists.linaro.org