From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0933FC10F14 for ; Thu, 3 Oct 2019 17:20:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D11C020830 for ; Thu, 3 Oct 2019 17:20:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570123226; bh=J2DOie5+rJ5lNglv194L5tZNcZlQOsaZ5mRHla4X5YE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2c/awHvd6lzN5PR0+j/TnpsK4zIa/jdX3lUcmgZIn7bRmmhIl9cX2UnXJnZ0RWY1s ULKrFWfN8PFtUF80K7YQtJJBmhiXGQoOpg4JczD1ZE0W/fTEmulX/TMU6LfTCOdn5P LsZIKXWBLYRC+yf0TFjfJZUmuZXMqfQWX7ob65Ds= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389453AbfJCQS1 (ORCPT ); Thu, 3 Oct 2019 12:18:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:44940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388580AbfJCQSW (ORCPT ); Thu, 3 Oct 2019 12:18:22 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 050A020865; Thu, 3 Oct 2019 16:18:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570119501; bh=J2DOie5+rJ5lNglv194L5tZNcZlQOsaZ5mRHla4X5YE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a2RiLTLU9P0DvkqLmb5l5cF+Z+xafN4XNnTGw3WoGAY2teR2DexkIscuGen/1yTWo 0sKsQ6AqfhA8Pyk76YDz2vdO5D/JGiWghze9Itd5+McKx8vPfZb7wq5cr+N+gcoPeW tb7Zlbtw/JA8GYqI4EaewFsjcrsNQ6GLZn3B2dWU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Josef Bacik , Mike Christie , Jens Axboe , Sasha Levin Subject: [PATCH 4.19 089/211] nbd: add missing config put Date: Thu, 3 Oct 2019 17:52:35 +0200 Message-Id: <20191003154507.323052521@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154447.010950442@linuxfoundation.org> References: <20191003154447.010950442@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mike Christie [ Upstream commit 887e975c4172d0d5670c39ead2f18ba1e4ec8133 ] Fix bug added with the patch: commit 8f3ea35929a0806ad1397db99a89ffee0140822a Author: Josef Bacik 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 Signed-off-by: Mike Christie Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/nbd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index fa60f265ee506..b1c7009de1f4d 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -353,8 +353,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), -- 2.20.1