Skip to contentSkip to conversation

io_uring/poll: fix upper bits poll updating

PATCH In review Jens Axboe 1 participant 2 messages Mar 13, 2024 io_uring

lore
Share & tools
lore

Jens Axboe

author maintainer
#0 lore raw

PATCH 1/1 io_uring/poll: fix upper bits poll updating

If IORING_POLL_UPDATE_EVENTS is used to updated the mask of a pending poll request, then we mask off the bottom 16 bits and mask in the new ones. But this prevents updating higher entry bits, which wasn't the intent.

Rather than play masking games, simply overwrite the existing poll entry mask with the new one.

Fixes b69de288e913 ("io_uring: allow events and user_data update of running poll requests")

---

io_uring/poll.c +1 -2
index 5f779139cae1..721f42a14c3e 100644
@@ -1030,8 +1030,7 @@ int io_poll_remove(struct io_kiocb *req, unsigned int issue_flags)
 		if (poll_update->update_events) {
 			struct io_poll *poll = io_kiocb_to_cmd(preq, struct io_poll);
 
-			poll->events &= ~0xffff;
-			poll->events |= poll_update->events & 0xffff;
+			poll->events = poll_update->events;
 			poll->events |= IO_POLL_UNMASK;
 		}
 		if (poll_update->update_user_data)
Signature · 1 line
Jens Axboe
author maintainer
#1 lore raw
Quoted 7 lines · Jens Axboe

If IORING_POLL_UPDATE_EVENTS is used to updated the mask of a pending poll request, then we mask off the bottom 16 bits and mask in the new ones. But this prevents updating higher entry bits, which wasn't the intent.

Rather than play masking games, simply overwrite the existing poll entry mask with the new one.

This can't work, some of the upper flags will decide state. So just disregard this one!

Signature · 1 line
Jens Axboe