diff options
| author | Jens Axboe <axboe@kernel.dk> | 2021-12-21 06:32:24 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-12-21 06:32:24 +0300 |
| commit | a957b61254a7d59a6c14ee2ac2db20a62eb299a1 (patch) | |
| tree | a3987037f0103e3bf5118ec1845815b2810a1ced /block | |
| parent | 518579a9af10a4b7b952a8366566fdcc7cfce3ca (diff) | |
| download | linux-a957b61254a7d59a6c14ee2ac2db20a62eb299a1.tar.xz | |
block: fix error in handling dead task for ioprio setting
Don't combine the task exiting and "already have io_context" case, we
need to just abort if the task is marked as dead. Return -ESRCH, which
is the documented value for ioprio_set() if the specified task could not
be found.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Reported-by: syzbot+8836466a79f4175961b0@syzkaller.appspotmail.com
Fixes: 5fc11eebb4a9 ("block: open code create_task_io_context in set_task_ioprio")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-ioc.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/block/blk-ioc.c b/block/blk-ioc.c index 87bdc9ca8295..71c3a933cf16 100644 --- a/block/blk-ioc.c +++ b/block/blk-ioc.c @@ -279,7 +279,12 @@ int set_task_ioprio(struct task_struct *task, int ioprio) return -ENOMEM; task_lock(task); - if (task->io_context || (task->flags & PF_EXITING)) { + if (task->flags & PF_EXITING) { + err = -ESRCH; + kmem_cache_free(iocontext_cachep, ioc); + goto out; + } + if (task->io_context) { kmem_cache_free(iocontext_cachep, ioc); ioc = task->io_context; } else { @@ -287,8 +292,9 @@ int set_task_ioprio(struct task_struct *task, int ioprio) } } task->io_context->ioprio = ioprio; +out: task_unlock(task); - return 0; + return err; } EXPORT_SYMBOL_GPL(set_task_ioprio); |