io_uring: disallow modification of rsrc_data during quiesce
PATCH 1/1 io_uring: disallow modification of rsrc_data during quiesce
io_rsrc_ref_quiesce will unlock the uring while it waits for references to the io_rsrc_data to be killed.
There are other places to the data that might add references to data via calls to io_rsrc_node_switch.
There is a race condition where this reference can be added after the completion has been signalled. At this point the io_rsrc_ref_quiesce call will wake up and relock the uring, assuming the data is unused and can be freed - although it is actually being used.
To fix this check in io_rsrc_ref_quiesce if a resource has been revived.
--- fs/io_uring.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
fs/io_uring.c +9 -1
@@ -7924,7 +7924,15 @@ static __cold int io_rsrc_ref_quiesce(struct io_rsrc_data *data, ret =wait_for_completion_interruptible (&data->done);if (!ret) {mutex_lock (&ctx->uring_lock); -break ; +if (atomic_read (&data->refs) >0 ) { +/* +* it has been revived by another thread while +* we were unlocked +*/ +mutex_unlock (&ctx->uring_lock); + }else { +break ; + } }atomic_inc (&data->refs);
base-commit: cfb92440ee71adcc2105b0890bb01ac3cddb8507
Signature · 1 line
2.30.2
Quoted 10 lines · Dylan Yudaken
io_rsrc_ref_quiescewill unlock the uring while it waits for references to theio_rsrc_datato be killed.
There are other places to the data that might add references to data via calls toio_rsrc_node_switch.
There is a race condition where this reference can be added after the completion has been signalled. At this point theio_rsrc_ref_quiescecall will wake up and relock the uring, assuming the data is unused and can be freed - although it is actually being used.[...]
Applied, thanks!
[1/1] io_uring: disallow modification of rsrc_data during quiesce
commit: 80912cef18f16f8fe59d1fb9548d4364342be360
Best regards,
Signature · 1 line
Jens Axboe