Skip to content

Commit 8f0a248

Browse files
isilenceaxboe
authored andcommitted
io_uring: zero tag on rsrc removal
Automatically default rsrc tag in io_queue_rsrc_removal(), it's safer than leaving it there and relying on the rest of the code to behave and not use it. Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://lore.kernel.org/r/1cf262a50df17478ea25b22494dcc19f3a80301f.1649336342.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent a07211e commit 8f0a248

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

fs/io_uring.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8927,13 +8927,15 @@ static int io_sqe_file_register(struct io_ring_ctx *ctx, struct file *file,
89278927
static int io_queue_rsrc_removal(struct io_rsrc_data *data, unsigned idx,
89288928
struct io_rsrc_node *node, void *rsrc)
89298929
{
8930+
u64 *tag_slot = io_get_tag_slot(data, idx);
89308931
struct io_rsrc_put *prsrc;
89318932

89328933
prsrc = kzalloc(sizeof(*prsrc), GFP_KERNEL);
89338934
if (!prsrc)
89348935
return -ENOMEM;
89358936

8936-
prsrc->tag = *io_get_tag_slot(data, idx);
8937+
prsrc->tag = *tag_slot;
8938+
*tag_slot = 0;
89378939
prsrc->rsrc = rsrc;
89388940
list_add(&prsrc->list, &node->rsrc_list);
89398941
return 0;

0 commit comments

Comments
 (0)