Skip to contentSkip to conversation

io_uring: assign file_slot prior to calling io_sqe_file_register()

PATCH New Jens Axboe 1 participant 1 message Feb 11, 2021

Subsystems (2)
lore
Share & tools
lore

Jens Axboe

author maintainer
#0 lore raw

PATCH 1/1 io_uring: assign file_slot prior to calling io_sqe_file_register()

We use the assigned slot in io_sqe_file_register(), and a previous patch moved the assignment to after we have called it. This isn't super pretty, and will get cleaned up in the future. For now, fix the regression by restoring the previous assignment/clear of the file_slot.

Fixes ea64ec02b31d ("io_uring: deduplicate file table slot calculation")

---

fs/io_uring.c +2 -1
index f730af32c17a..cd9c4c05f6f5 100644
@@ -8112,12 +8112,13 @@ static int __io_sqe_files_update(struct io_ring_ctx *ctx,
 				err = -EBADF;
 				break;
 			}
+			*file_slot = file;
 			err = io_sqe_file_register(ctx, file, i);
 			if (err) {
+				*file_slot = NULL;
 				fput(file);
 				break;
 			}
-			*file_slot = file;
 		}
 	}
 
Signature · 1 line
Jens Axboe