Skip to content

Commit 5c3d858

Browse files
Ming Leiaxboe
authored andcommitted
block: fail to show/store elevator sysfs attribute if elevator is dying
Prepare for moving elv_register[unregister]_queue out of elevator_lock & queue freezing, so we may have to call elv_unregister_queue() after elevator ->exit() is called, then there is small window for user to call into ->show()/store(), and user-after-free can be caused. Fail to show/store elevator sysfs attribute if elevator is dying by adding one new flag of ELEVATOR_FLAG_DYNG, which is protected by elevator ->sysfs_lock. Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Nilay Shroff <[email protected]> Signed-off-by: Ming Lei <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent e25ee50 commit 5c3d858

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

block/blk-mq-sched.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,5 +551,6 @@ void blk_mq_exit_sched(struct request_queue *q, struct elevator_queue *e)
551551
if (e->type->ops.exit_sched)
552552
e->type->ops.exit_sched(e);
553553
blk_mq_sched_tags_teardown(q, flags);
554+
set_bit(ELEVATOR_FLAG_DYING, &q->elevator->flags);
554555
q->elevator = NULL;
555556
}

block/elevator.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,14 +418,15 @@ elv_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
418418
{
419419
const struct elv_fs_entry *entry = to_elv(attr);
420420
struct elevator_queue *e;
421-
ssize_t error;
421+
ssize_t error = -ENODEV;
422422

423423
if (!entry->show)
424424
return -EIO;
425425

426426
e = container_of(kobj, struct elevator_queue, kobj);
427427
mutex_lock(&e->sysfs_lock);
428-
error = entry->show(e, page);
428+
if (!test_bit(ELEVATOR_FLAG_DYING, &e->flags))
429+
error = entry->show(e, page);
429430
mutex_unlock(&e->sysfs_lock);
430431
return error;
431432
}
@@ -436,14 +437,15 @@ elv_attr_store(struct kobject *kobj, struct attribute *attr,
436437
{
437438
const struct elv_fs_entry *entry = to_elv(attr);
438439
struct elevator_queue *e;
439-
ssize_t error;
440+
ssize_t error = -ENODEV;
440441

441442
if (!entry->store)
442443
return -EIO;
443444

444445
e = container_of(kobj, struct elevator_queue, kobj);
445446
mutex_lock(&e->sysfs_lock);
446-
error = entry->store(e, page, length);
447+
if (!test_bit(ELEVATOR_FLAG_DYING, &e->flags))
448+
error = entry->store(e, page, length);
447449
mutex_unlock(&e->sysfs_lock);
448450
return error;
449451
}

block/elevator.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ struct elevator_queue
121121
};
122122

123123
#define ELEVATOR_FLAG_REGISTERED 0
124+
#define ELEVATOR_FLAG_DYING 1
124125

125126
/*
126127
* block elevator interface

0 commit comments

Comments
 (0)