diff options
| author | Mike Christie <mchristi@redhat.com> | 2019-08-13 11:39:51 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-05 13:13:44 +0200 |
| commit | 8e8821e511803d07375ffe20a326b3baaac87f64 (patch) | |
| tree | 391f97f82a5beb06487622fd54094bb3d227d018 | |
| parent | cb00bdfdf4a1c160300ed3c9c897eb91e274f7e2 (diff) | |
| download | linux-stable-8e8821e511803d07375ffe20a326b3baaac87f64.tar.gz linux-stable-8e8821e511803d07375ffe20a326b3baaac87f64.tar.bz2 linux-stable-8e8821e511803d07375ffe20a326b3baaac87f64.zip | |
nbd: add missing config put
[ Upstream commit 887e975c4172d0d5670c39ead2f18ba1e4ec8133 ]
Fix bug added with the patch:
commit 8f3ea35929a0806ad1397db99a89ffee0140822a
Author: Josef Bacik <josef@toxicpanda.com>
Date: Mon Jul 16 12:11:35 2018 -0400
nbd: handle unexpected replies better
where if the timeout handler runs when the completion path is and we fail
to grab the mutex in the timeout handler we will leave a config reference
and cannot free the config later.
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Mike Christie <mchristi@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/block/nbd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 57aebc6e1c28..5d5e52c6509c 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -355,8 +355,10 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req, } config = nbd->config; - if (!mutex_trylock(&cmd->lock)) + if (!mutex_trylock(&cmd->lock)) { + nbd_config_put(nbd); return BLK_EH_RESET_TIMER; + } if (config->num_connections > 1) { dev_err_ratelimited(nbd_to_dev(nbd), |