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=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=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 0AFE8C433E7 for ; Mon, 12 Oct 2020 13:42:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B3FD620878 for ; Mon, 12 Oct 2020 13:42:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602510171; bh=HAuengNthdDvCmZ0JukO7cZtza2GxFWMWld0I5lHcVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=m5SshyUMmcrl22GqQUVSso0g/PUjYVoYnO8qBVSKnqmaSjDQys8EZIr93oEC6rj1z 7OM6Z0XM1YaZiKgH9r3gGpqMP3ttFCTisIcGGjWbx5qmuWcJt4sWAM9rXaoDBuqD6h iN17CXAqRhP/tZm4bF21tz5CO/0Mjbvd8QubQ3K8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731558AbgJLNmu (ORCPT ); Mon, 12 Oct 2020 09:42:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:46200 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730994AbgJLNlh (ORCPT ); Mon, 12 Oct 2020 09:41:37 -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 CE08521BE5; Mon, 12 Oct 2020 13:41:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602510082; bh=HAuengNthdDvCmZ0JukO7cZtza2GxFWMWld0I5lHcVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SvvAVDvJ/feq0+grKNV9ZvCuqj2ne5MhIeDoHUL0C+w0g9dwG4TO7CGi+XcB1yNDd C2nXPdvbP7ZRqDnm6pSrK8YWCG6xuOUuDYESKrDThQF8j1+ydzA4lSM1IXY024ZbzK FIMdle5iVS/YCRorbWYL9C+Dd5QNO40UNAO3d+fo= 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 5.4 32/85] nvme-core: put ctrl ref when module ref get fail Date: Mon, 12 Oct 2020 15:26:55 +0200 Message-Id: <20201012132634.402282637@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012132632.846779148@linuxfoundation.org> References: <20201012132632.846779148@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -2932,8 +2932,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;