From patchwork Mon Oct 12 13:27:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 270362 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=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 2CF54C433E7 for ; Mon, 12 Oct 2020 13:39:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D868C22202 for ; Mon, 12 Oct 2020 13:39:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602509964; bh=uvwa/k5xa2M1gsseXq64HOYbcOvqvzqq/Zn+AUygn8I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ggYm+UIvmSHI173Al8XSHeJQmUHOd50i3/PXKUQJ9XxT9c9qQRlXcQ78rOkVcRiwG FCF0pOypYtZEQUro4h3w3djQpGaiXDu1wKnoTt3LSYaCeACCEZpgJBR7AS5oquiyZV r+QxH8iIaQ3oxE4LaArX8Yq5colJLN+imKp2rwX4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731285AbgJLNjX (ORCPT ); Mon, 12 Oct 2020 09:39:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:40158 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730053AbgJLNio (ORCPT ); Mon, 12 Oct 2020 09:38:44 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 8C5BE21BE5; Mon, 12 Oct 2020 13:38:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602509924; bh=uvwa/k5xa2M1gsseXq64HOYbcOvqvzqq/Zn+AUygn8I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U3fNfDJiuTl7eus9IjXZJPG3ktJgD99NmtOr3hrzTGkWVUsM8c27lbbBo33ZiITcg 4IGKY6Mg014/U+Eh37Qu08taUJeLFQVYSti3igd5qxGja5QOTU8LSqtFKwX4nD0hn2 Rkyvco/j8ZroONDiAmEHGQe7z254kcdXrIkCd/VM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chaitanya Kulkarni , Logan Gunthorpe , Christoph Hellwig Subject: [PATCH 4.19 17/49] nvme-core: put ctrl ref when module ref get fail Date: Mon, 12 Oct 2020 15:27:03 +0200 Message-Id: <20201012132630.238981493@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012132629.469542486@linuxfoundation.org> References: <20201012132629.469542486@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chaitanya Kulkarni commit 4bab69093044ca81f394bd0780be1b71c5a4d308 upstream. When try_module_get() fails in the nvme_dev_open() it returns without releasing the ctrl reference which was taken earlier. Put the ctrl reference which is taken before calling the try_module_get() in the error return code path. Fixes: 52a3974feb1a "nvme-core: get/put ctrl and transport module in nvme_dev_open/release()" Signed-off-by: Chaitanya Kulkarni Reviewed-by: Logan Gunthorpe Signed-off-by: Christoph Hellwig Signed-off-by: Greg Kroah-Hartman --- drivers/nvme/host/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2606,8 +2606,10 @@ static int nvme_dev_open(struct inode *i } nvme_get_ctrl(ctrl); - if (!try_module_get(ctrl->ops->module)) + if (!try_module_get(ctrl->ops->module)) { + nvme_put_ctrl(ctrl); return -EINVAL; + } file->private_data = ctrl; return 0;