block, loop: Increment diskseq when releasing a loop device
PATCH 1/1 block, loop: Increment diskseq when releasing a loop device
The previous patch for checking diskseq in blkback is not enough to prevent the following race:
1. Program X opens a loop device
2. Program X gets the diskseq of the loop device.
3. Program X associates a file with the loop device.
4. Program X passes the loop device major, minor, and diskseq to something.
5. Program X exits.
6. Program Y detaches the file from the loop device.
7. Program Y attaches a different file to the loop device.
8. The opener finally gets around to opening the loop device and checks that the diskseq is what it expects it to be. Even though the diskseq is the expected value, the result is that the opener is accessing the wrong file.
To prevent this race condition, increment the diskseq of a loop device when it is detached from its file descriptor. This causes blkback (or any other program, for that matter) to fail at step 8. Export the inc_diskseq() function to make this possible.
---
I considered destroying the loop device altogether instead of bumping its diskseq, but was not able to accomplish that. Suggestions welcome.
--- block/genhd.c | 1 + drivers/block/loop.c | 6 ++++++ 2 files changed, 7 insertions(+)
block/genhd.c +1 -0
@@ -1502,3 +1502,4 @@ void inc_diskseq(struct gendisk *disk) { disk->diskseq =atomic64_inc_return (&diskseq); } +EXPORT_SYMBOL (inc_diskseq);
drivers/block/loop.c +6 -0
@@ -1205,6 +1205,12 @@ static void __loop_clr_fd(struct loop_device *lo, bool release)if (!part_shift)set_bit (GD_SUPPRESS_PART_SCAN , &lo->lo_disk->state);mutex_lock (&lo->lo_mutex); + +/* +* Increment the disk sequence number, so that userspace knows this +* device now points to something else. +*/ +inc_diskseq (lo->lo_disk); lo->lo_state = Lo_unbound;mutex_unlock (&lo->lo_mutex);
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab
block/genhd.c void inc_diskseq(struct gendisk *disk) · line 1505
Quoted 6 lines
+++
b/block/genhd.cblock/genhd.c +1
-0@@ -1502,3 +1502,4 @@ void inc_diskseq(struct gendisk *disk) { disk->diskseq =atomic64_inc_return (&diskseq); } +EXPORT_SYMBOL (inc_diskseq);
I really do not like exporting this as a lowlevel function. If we increment the sequence it should be part of a higher level operation.
drivers/block/loop.c static void __loop_clr_fd(struct loop_device *lo, bool release) · line 1213
Quoted 12 lines
drivers/block/loop.c +6
-0@@ -1205,6 +1205,12 @@ static void __loop_clr_fd(struct loop_device *lo, bool release)if (!part_shift)set_bit (GD_SUPPRESS_PART_SCAN , &lo->lo_disk->state);mutex_lock (&lo->lo_mutex); + +/* +* Increment the disk sequence number, so that userspace knows this +* device now points to something else. +*/ +inc_diskseq (lo->lo_disk);
And I'm not sure why we even need this. __loop_clr_fd already calls disk_force_media_change, which calls inc_diskseq. Why do we need an extra increment?
Quoted 9 lines · Christoph Hellwig
block/genhd.c void inc_diskseq(struct gendisk *disk) · line 1505
Quoted 6 lines
+++
b/block/genhd.cblock/genhd.c +1
-0@@ -1502,3 +1502,4 @@ void inc_diskseq(struct gendisk *disk) { disk->diskseq =atomic64_inc_return (&diskseq); } +EXPORT_SYMBOL (inc_diskseq);I really do not like exporting this as a lowlevel function. If we increment the sequence it should be part of a higher level operation.
Fair!
Quoted 8 lines
Quoted 8 lines
drivers/block/loop.c +2
-0@@ -1205,6 +1205,12 @@ static void __loop_clr_fd(struct loop_device *lo, bool release)if (!part_shift)set_bit (GD_SUPPRESS_PART_SCAN , &lo->lo_disk->state);mutex_lock (&lo->lo_mutex); + +/*
Quoted 8 lines
drivers/block/loop.c static void __loop_clr_fd(struct loop_device *lo, bool release) · line 1213
Quoted 4 lines
drivers/block/loop.c +4
-0+* Increment the disk sequence number, so that userspace knows this +* device now points to something else. +*/ +inc_diskseq (lo->lo_disk);And I'm not sure why we even need this.
__loop_clr_fdalready callsdisk_force_media_change, which callsinc_diskseq. Why do we need an extra increment?
How does disk_force_media_change() call inc_diskseq()? I don’t see any calls in the source code. I’m going to use systemtap to see if there is an indirect call chain.
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab
Quoted 17 lines · Demi Marie Obenour
Quoted 8 lines
Quoted 8 lines
drivers/block/loop.c +2
-0@@ -1205,6 +1205,12 @@ static void __loop_clr_fd(struct loop_device *lo, bool release)if (!part_shift)set_bit (GD_SUPPRESS_PART_SCAN , &lo->lo_disk->state);mutex_lock (&lo->lo_mutex); + +/* Quoted 8 lines
drivers/block/loop.c static void __loop_clr_fd(struct loop_device *lo, bool release) · line 1213
Quoted 4 lines
drivers/block/loop.c +4
-0+* Increment the disk sequence number, so that userspace knows this +* device now points to something else. +*/ +inc_diskseq (lo->lo_disk);And I'm not sure why we even need this.
__loop_clr_fdalready callsdisk_force_media_change, which callsinc_diskseq. Why do we need an extra increment?
Quoted 3 lines
How does
disk_force_media_change()callinc_diskseq()? I don’t see any calls in the source code. I’m going to use systemtap to see if there is an indirect call chain.
Were you thinking of bdev_check_media_change()? That can call inc_diskseq() via this call chain:
bdev_check_media_change()
disk_clear_events()
disk_check_events()
inc_diskseq()
disk_force_media_change() does not call inc_diskseq(), and I checked that calling losetup -D does not change the diskseq of a loop device. From what you have writte, I’m pretty sure that’s a bug in disk_force_media_change(), though. I’ll send a v3 that adds this call.
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab