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=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 24EC0C43603 for ; Wed, 11 Dec 2019 15:21:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D9DBA2465B for ; Wed, 11 Dec 2019 15:21:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077678; bh=beiUjmyuBgp35NQy+gRPHb1sOJ7HQPGyZw4jEV+9fjA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tEabhzX2tMtoobwtmtPprmv4v1FaXJGPKi3wGtlPg0OrPtP3XiSviqkEKIzv3jRO9 kzZrKkWbX8PLiRfNhrkC4E8LZE8KM9dH/GS52N1ApZCl46f5aPDX68lf/sUGWdX+Sy 6sFc2M+reg0f9NYYudzKOxdC02Hlss0f3nT+Xr4k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732445AbfLKPVQ (ORCPT ); Wed, 11 Dec 2019 10:21:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:51398 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732433AbfLKPVO (ORCPT ); Wed, 11 Dec 2019 10:21:14 -0500 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 461982073D; Wed, 11 Dec 2019 15:21:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077673; bh=beiUjmyuBgp35NQy+gRPHb1sOJ7HQPGyZw4jEV+9fjA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=epu5EwdQ/z0gor9VZGg2MrJaQjgtrr+RcN7dSVyphuU+/Jk9pW59/Jt1x+NNp9oDx hkBkjwHrfpxGrWhmRKFt/DqxFo3T45WnBOOAdYfNs5f+GjO3EqyB9SEJTLWOMulsvT Xz7u+BEPdJkc8yRQvBZTB/jrhWhpjl9CR9C604KM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Keith Busch , Christoph Hellwig , Sasha Levin Subject: [PATCH 4.19 110/243] nvme: Free ctrl device name on init failure Date: Wed, 11 Dec 2019 16:04:32 +0100 Message-Id: <20191211150346.558585307@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150339.185439726@linuxfoundation.org> References: <20191211150339.185439726@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: Keith Busch [ Upstream commit d6a2b9535d1e52bea269c138614c4801469d10e1 ] Free the kobject name that was allocated for the controller device on failure rather than its parent. Fixes: d22524a4782a9 ("nvme: switch controller refcounting to use struct device") Signed-off-by: Keith Busch Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index c4ff4f079448e..b2d9bd564960a 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -3652,7 +3652,7 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, return 0; out_free_name: - kfree_const(dev->kobj.name); + kfree_const(ctrl->device->kobj.name); out_release_instance: ida_simple_remove(&nvme_instance_ida, ctrl->instance); out: -- 2.20.1