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 69834C32792 for ; Thu, 3 Oct 2019 16:31:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 340C22133F for ; Thu, 3 Oct 2019 16:31:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120279; bh=7mbt/MR23Cq3RngDGbuCsKYRWXTfMwedUxRS8ns4pmM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZVvJcc4bQLC89WqBuYYxYqPng9+mAbsX3mCV/aLcVvxrMypNcq9D1pMiHOSm+RS7G nf7GlNytHwLFKSySoaLoGrmZ3SEzo+DbLsOqPWOIkGkDENpF4KFQU9OCnpsfjBjZAL XIgAoFuMmwNHylSW0qQFltpgPdbyw3u2jOeTGX3s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391292AbfJCQbS (ORCPT ); Thu, 3 Oct 2019 12:31:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:37944 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390173AbfJCQbO (ORCPT ); Thu, 3 Oct 2019 12:31:14 -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 34B1920830; Thu, 3 Oct 2019 16:31:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120273; bh=7mbt/MR23Cq3RngDGbuCsKYRWXTfMwedUxRS8ns4pmM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BOrvTVzTgt5jW/joYCX0WHcrhiC6taD97q0lSEqMA7yv2E2xbYnP1zLF9Pg1BgR2P Z8ooQgz9fgTwrnNYgpsvNILo7cBb/zoVVzNbDROQWfOkHh/rX5PyuOyDrT56NxBQOK 5tCUTGvVml+EEiGHd3sGClM+xMIYMgVHcxanU7+M= 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 5.2 122/313] nbd: add missing config put Date: Thu, 3 Oct 2019 17:51:40 +0200 Message-Id: <20191003154544.973960085@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154533.590915454@linuxfoundation.org> References: <20191003154533.590915454@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 57aebc6e1c288..5d5e52c6509ce 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), -- 2.20.1