mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 18:30:06 +00:00
um: Fix for a possible OOPS in ubd initialization
If the ubd device failed to allocate a queue during initialization it tried call blk_cleanup_queue resulting in an oops. This patch simplifies the cleanup logic and ensures that blk_queue_cleanup is called only if there is a valid queue. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Anton Ivanov <anton.ivanov@cambridgegreys.com> Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
parent
df20af1e27
commit
aea05eb56e
1 changed files with 3 additions and 3 deletions
|
@ -938,7 +938,7 @@ static int ubd_add(int n, char **error_out)
|
|||
ubd_dev->queue = blk_mq_init_queue(&ubd_dev->tag_set);
|
||||
if (IS_ERR(ubd_dev->queue)) {
|
||||
err = PTR_ERR(ubd_dev->queue);
|
||||
goto out_cleanup;
|
||||
goto out_cleanup_tags;
|
||||
}
|
||||
|
||||
ubd_dev->queue->queuedata = ubd_dev;
|
||||
|
@ -968,8 +968,8 @@ static int ubd_add(int n, char **error_out)
|
|||
|
||||
out_cleanup_tags:
|
||||
blk_mq_free_tag_set(&ubd_dev->tag_set);
|
||||
out_cleanup:
|
||||
blk_cleanup_queue(ubd_dev->queue);
|
||||
if (!(IS_ERR(ubd_dev->queue)))
|
||||
blk_cleanup_queue(ubd_dev->queue);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue