mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
io_uring-5.14-2021-07-16
-----BEGIN PGP SIGNATURE----- iQJEBAABCAAuFiEEwPw5LcreJtl1+l5K99NY+ylx4KYFAmDxlXoQHGF4Ym9lQGtl cm5lbC5kawAKCRD301j7KXHgpmriEACbXk5zuQvG5jRX4k2c5w8/rjz9y1vQTxsy V/jNVlv+ZS3RrC4+JeRQQRF5+80xkKTsFFNxplT8wIguFSQPJ9VM80N+vDU6n3hi dqF4J/Em0IsQRWWzG8YdZc0QjPdDhiA9vrlRqfp7vYZQt1+2Lpyg/Me6t1lppTB7 tH8hCFCE04oYR7TzFTmaeKUUIhmhiR2/dC1PR+G1IZWPInD9WbL/9UF2uMInReDN W7WNPexLRdkU2/89Qtcyfv5wlq9TyrWSU6K9hYQc1EJKUlcd3hRKyD+mAyAseUro 0o5NHNbu0yuZf1vU6oyXIEDjQ8a0LGGdZxlFY8OCuAOgJQhGVm4G+2bzTPOkkABa f8pSIDnHymqMqjhg3KfODR9p4aKFhsG9KvDzvgaS8PDckXTIn0rr8P+lCQ4jDPD3 rdkRdt01uPoSgaNoElxzwrUV+gQX4Hv5qL4nDxpoGvBEOhgytdnfhNGzHWmZOlWk M9RdAsMWpbUuht4YJ93IxdXLSAhju1K+45IzutNnjfxeavnGCW9tQLjIGsPrUkPm NweuMQfYcvrnAqefrOO1gcWdSyrXWN//Ae4iMBLetg8UXXuH/Pd6NXOQ762hV5tC kka6DnlpJLB3LF5STLubfL3Gul+faEqgLWQgwt5XRoZjHySb7SnDwUFUTMY4z6ie UkxWeICp9Q== =7nbe -----END PGP SIGNATURE----- Merge tag 'io_uring-5.14-2021-07-16' of git://git.kernel.dk/linux-block Pull io_uring fixes from Jens Axboe: "Two small fixes: one fixing the process target of a check, and the other a minor issue with the drain error handling" * tag 'io_uring-5.14-2021-07-16' of git://git.kernel.dk/linux-block: io_uring: fix io_drain_req() io_uring: use right task for exiting checks
This commit is contained in:
commit
13fdaf0410
1 changed files with 5 additions and 3 deletions
|
@ -2016,7 +2016,7 @@ static void io_req_task_submit(struct io_kiocb *req)
|
||||||
|
|
||||||
/* ctx stays valid until unlock, even if we drop all ours ctx->refs */
|
/* ctx stays valid until unlock, even if we drop all ours ctx->refs */
|
||||||
mutex_lock(&ctx->uring_lock);
|
mutex_lock(&ctx->uring_lock);
|
||||||
if (!(current->flags & PF_EXITING) && !current->in_execve)
|
if (!(req->task->flags & PF_EXITING) && !req->task->in_execve)
|
||||||
__io_queue_sqe(req);
|
__io_queue_sqe(req);
|
||||||
else
|
else
|
||||||
io_req_complete_failed(req, -EFAULT);
|
io_req_complete_failed(req, -EFAULT);
|
||||||
|
@ -6019,11 +6019,13 @@ static bool io_drain_req(struct io_kiocb *req)
|
||||||
|
|
||||||
ret = io_req_prep_async(req);
|
ret = io_req_prep_async(req);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
goto fail;
|
||||||
io_prep_async_link(req);
|
io_prep_async_link(req);
|
||||||
de = kmalloc(sizeof(*de), GFP_KERNEL);
|
de = kmalloc(sizeof(*de), GFP_KERNEL);
|
||||||
if (!de) {
|
if (!de) {
|
||||||
io_req_complete_failed(req, -ENOMEM);
|
ret = -ENOMEM;
|
||||||
|
fail:
|
||||||
|
io_req_complete_failed(req, ret);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue