提交 c9edfb29 编写于 作者: K Kamal Mostafa 提交者: Zheng Zengkai

io_uring: fix splice_fd_in checks backport typo

stable inclusion
from stable-5.10.76
commit f59da9f7efa73a31b6287bd9b8f03a8d536e524f
bugzilla: 182988 https://gitee.com/openeuler/kernel/issues/I4IAHF

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f59da9f7efa73a31b6287bd9b8f03a8d536e524f

--------------------------------

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: NKamal Mostafa <kamal@canonical.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 9c243634
...@@ -5559,7 +5559,7 @@ static int io_timeout_remove_prep(struct io_kiocb *req, ...@@ -5559,7 +5559,7 @@ static int io_timeout_remove_prep(struct io_kiocb *req,
return -EINVAL; return -EINVAL;
if (unlikely(req->flags & (REQ_F_FIXED_FILE | REQ_F_BUFFER_SELECT))) if (unlikely(req->flags & (REQ_F_FIXED_FILE | REQ_F_BUFFER_SELECT)))
return -EINVAL; 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) sqe->splice_fd_in)
return -EINVAL; return -EINVAL;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册