Skip to contentSkip to conversation

btrfs: check if task has died in btrfs_uring_read_finished()

PATCH New Mark Harmstone 1 participant 1 message Dec 13, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs: check if task has died in btrfs_uring_read_finished()

If the task has died by the time we call btrfs_uring_read_finished(), return -ECANCELED rather than trying to copy the pages back to userspace.

---
(This is quite possibly a resend. I intended this to be the sequel to "[PATCH 1/2] io_uring/cmd: let cmds to know about dying task", but I can't find it anywhere on the mailing lists now.)

 fs/btrfs/ioctl.c | 5 +++++
 1 file changed, 5 insertions(+)
fs/btrfs/ioctl.c +5 -0
index 64cebc32fe76..6913967083fe 100644
@@ -4754,6 +4754,11 @@ static void btrfs_uring_read_finished(struct io_uring_cmd *cmd, unsigned int iss
 	/* The inode lock has already been acquired in btrfs_uring_read_extent.  */
 	btrfs_lockdep_inode_acquire(inode, i_rwsem);
 
+	if (unlikely(issue_flags & IO_URING_F_TASK_DEAD)) {
+		ret = -ECANCELED;
+		goto out;
+	}
+
 	if (priv->err) {
 		ret = priv->err;
 		goto out;
Signature · 1 line
2.45.2