Commit ad00e629 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Jens Axboe

io_uring/net: check socket is valid in io_bind()/io_listen()

We need to check that sock_from_file(req->file) != NULL.
Reported-by: default avatarsyzbot <syzbot+1e811482aa2c70afa9a0@syzkaller.appspotmail.com>
Closes: https://syzkaller.appspot.com/bug?extid=1e811482aa2c70afa9a0
Fixes: 7481fd93 ("io_uring: Introduce IORING_OP_BIND")
Fixes: ff140cc8 ("io_uring: Introduce IORING_OP_LISTEN")
Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Link: https://lore.kernel.org/r/903da529-eaa3-43ef-ae41-d30f376c60cc@I-love.SAKURA.ne.jp
[axboe: move assignment of sock to where the NULL check is]
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 943ad0b6
...@@ -1747,9 +1747,14 @@ int io_bind(struct io_kiocb *req, unsigned int issue_flags) ...@@ -1747,9 +1747,14 @@ int io_bind(struct io_kiocb *req, unsigned int issue_flags)
{ {
struct io_bind *bind = io_kiocb_to_cmd(req, struct io_bind); struct io_bind *bind = io_kiocb_to_cmd(req, struct io_bind);
struct io_async_msghdr *io = req->async_data; struct io_async_msghdr *io = req->async_data;
struct socket *sock;
int ret; int ret;
ret = __sys_bind_socket(sock_from_file(req->file), &io->addr, bind->addr_len); sock = sock_from_file(req->file);
if (unlikely(!sock))
return -ENOTSOCK;
ret = __sys_bind_socket(sock, &io->addr, bind->addr_len);
if (ret < 0) if (ret < 0)
req_set_fail(req); req_set_fail(req);
io_req_set_res(req, ret, 0); io_req_set_res(req, ret, 0);
...@@ -1770,9 +1775,14 @@ int io_listen_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) ...@@ -1770,9 +1775,14 @@ int io_listen_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
int io_listen(struct io_kiocb *req, unsigned int issue_flags) int io_listen(struct io_kiocb *req, unsigned int issue_flags)
{ {
struct io_listen *listen = io_kiocb_to_cmd(req, struct io_listen); struct io_listen *listen = io_kiocb_to_cmd(req, struct io_listen);
struct socket *sock;
int ret; int ret;
ret = __sys_listen_socket(sock_from_file(req->file), listen->backlog); sock = sock_from_file(req->file);
if (unlikely(!sock))
return -ENOTSOCK;
ret = __sys_listen_socket(sock, listen->backlog);
if (ret < 0) if (ret < 0)
req_set_fail(req); req_set_fail(req);
io_req_set_res(req, ret, 0); io_req_set_res(req, ret, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment