Skip to contentSkip to conversation

io_uring/cancel: de-unionize file and user_data in struct io_cancel_data

PATCH New Jens Axboe 1 participant 1 message Feb 16 io_uring

lore
Share & tools
lore

Jens Axboe

author maintainer
#0 lore raw

PATCH 1/1 io_uring/cancel: de-unionize file and user_data in struct io_cancel_data

By having them share the same space in struct io_cancel_data, it ends up disallowing IORING_ASYNC_CANCEL_FD|IORING_ASYNC_CANCEL_USERDATA from working. Eg you cannot match on both a file and user_data for cancelation purposes. This obviously isn't a common use case as nobody has reported this, but it does result in -ENOENT potentially being returned when trying to match on both, rather than actually doing what the API says it would.

Fixes 4bf94615b888 ("io_uring: allow IORING_OP_ASYNC_CANCEL with 'fd' key")

---

io_uring/cancel.h +2 -4
index 6783961ede1b..1b201a094303 100644
@@ -6,10 +6,8 @@
 
 struct io_cancel_data {
 	struct io_ring_ctx *ctx;
-	union {
-		u64 data;
-		struct file *file;
-	};
+	u64 data;
+	struct file *file;
 	u8 opcode;
 	u32 flags;
 	int seq;
Signature · 1 line
Jens Axboe