Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix use-after-free in vdev_disk_physio_completion 

Currently, vdev_disk_physio_completion will try to wake up an waiter without
first checking the existence. This creates a race window in which complete is
called after dr is freed.

We add dr_wait in dio_request to indicate the existence of waiter. Also,
remove dr_rw since no one is using it, and reorder dr_ref to make the struct
more compact in 64bit.

Signed-off-by: Chunwei Chen <david.chen@osnexus.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #3917
Issue #3880
This commit is contained in:
Chunwei Chen 2015-10-13 14:13:52 -07:00 committed by Brian Behlendorf
parent bc4501f75a
commit aa159afb56
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
module/zfs/vdev_disk.c
View File

@ -42,9 +42,9 @@ static void *zfs_vdev_holder = VDEV_HOLDER;
*/ */
typedef struct dio_request { typedef struct dio_request {
struct completion dr_comp; /* Completion for sync IO */ struct completion dr_comp; /* Completion for sync IO */
atomic_t dr_ref; /* References */
zio_t *dr_zio; /* Parent ZIO */ zio_t *dr_zio; /* Parent ZIO */
int dr_rw; /* Read/Write */ atomic_t dr_ref; /* References */
int dr_wait; /* Wait for IO */
int dr_error; /* Bio error */ int dr_error; /* Bio error */
int dr_bio_count; /* Count of bio's */ int dr_bio_count; /* Count of bio's */
struct bio *dr_bio[0]; /* Attached bio's */ struct bio *dr_bio[0]; /* Attached bio's */
@ -407,6 +407,7 @@ BIO_END_IO_PROTO(vdev_disk_physio_completion, bio, error)
{ {
dio_request_t *dr = bio->bi_private; dio_request_t *dr = bio->bi_private;
int rc; int rc;
int wait;
if (dr->dr_error == 0) { if (dr->dr_error == 0) {
#ifdef HAVE_1ARG_BIO_END_IO_T #ifdef HAVE_1ARG_BIO_END_IO_T
@ -419,11 +420,12 @@ BIO_END_IO_PROTO(vdev_disk_physio_completion, bio, error)
#endif #endif
} }
wait = dr->dr_wait;
/* Drop reference aquired by __vdev_disk_physio */ /* Drop reference aquired by __vdev_disk_physio */
rc = vdev_disk_dio_put(dr); rc = vdev_disk_dio_put(dr);
/* Wake up synchronous waiter this is the last outstanding bio */ /* Wake up synchronous waiter this is the last outstanding bio */
if (rc == 1) if (wait && rc == 1)
complete(&dr->dr_comp); complete(&dr->dr_comp);
} }
@ -496,7 +498,7 @@ __vdev_disk_physio(struct block_device *bdev, zio_t *zio, caddr_t kbuf_ptr,
dio_request_t *dr; dio_request_t *dr;
caddr_t bio_ptr; caddr_t bio_ptr;
uint64_t bio_offset; uint64_t bio_offset;
int bio_size, bio_count = 16; int rw, bio_size, bio_count = 16;
int i = 0, error = 0; int i = 0, error = 0;
ASSERT3U(kbuf_offset + kbuf_size, <=, bdev->bd_inode->i_size); ASSERT3U(kbuf_offset + kbuf_size, <=, bdev->bd_inode->i_size);
@ -509,8 +511,9 @@ retry:
if (zio && !(zio->io_flags & (ZIO_FLAG_IO_RETRY | ZIO_FLAG_TRYHARD))) if (zio && !(zio->io_flags & (ZIO_FLAG_IO_RETRY | ZIO_FLAG_TRYHARD)))
bio_set_flags_failfast(bdev, &flags); bio_set_flags_failfast(bdev, &flags);
rw = flags;
dr->dr_zio = zio; dr->dr_zio = zio;
dr->dr_rw = flags; dr->dr_wait = wait;
/* /*
* When the IO size exceeds the maximum bio size for the request * When the IO size exceeds the maximum bio size for the request
@ -552,7 +555,7 @@ retry:
dr->dr_bio[i]->bi_bdev = bdev; dr->dr_bio[i]->bi_bdev = bdev;
BIO_BI_SECTOR(dr->dr_bio[i]) = bio_offset >> 9; BIO_BI_SECTOR(dr->dr_bio[i]) = bio_offset >> 9;
dr->dr_bio[i]->bi_rw = dr->dr_rw; dr->dr_bio[i]->bi_rw = rw;
dr->dr_bio[i]->bi_end_io = vdev_disk_physio_completion; dr->dr_bio[i]->bi_end_io = vdev_disk_physio_completion;
dr->dr_bio[i]->bi_private = dr; dr->dr_bio[i]->bi_private = dr;
@ -572,7 +575,7 @@ retry:
/* Submit all bio's associated with this dio */ /* Submit all bio's associated with this dio */
for (i = 0; i < dr->dr_bio_count; i++) for (i = 0; i < dr->dr_bio_count; i++)
if (dr->dr_bio[i]) if (dr->dr_bio[i])
vdev_submit_bio(dr->dr_rw, dr->dr_bio[i]); vdev_submit_bio(rw, dr->dr_bio[i]);
/* /*
* On synchronous blocking requests we wait for all bio the completion * On synchronous blocking requests we wait for all bio the completion