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=-6.8 required=3.0 tests=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 08A0AC3B189 for ; Thu, 13 Feb 2020 15:40:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C5C072073C for ; Thu, 13 Feb 2020 15:40:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581608401; bh=obH4/DaO/opBIJgt8oyRpklHKyIoA0/WRywmZyAtvxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lIG7+qqeROpslGs6w++H3Ksoaq+p7bMsEk5iQk3obuUbFumBGAAvOr2ZFzUafeSAc PZ2Hf4lpH0RoVGKSK4/OhZO1p9Cq8e3Tr00RFjcw/Oh5+xrZ3CQM3Zwc/MhyaZk8IZ NMPuANqpoD+9PyzZh7SRNbe9eo+DwGTa1u/WajxY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728958AbgBMPkB (ORCPT ); Thu, 13 Feb 2020 10:40:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:57192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729301AbgBMP2v (ORCPT ); Thu, 13 Feb 2020 10:28:51 -0500 Received: from localhost (unknown [104.132.1.104]) (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 7C75624670; Thu, 13 Feb 2020 15:28:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607730; bh=obH4/DaO/opBIJgt8oyRpklHKyIoA0/WRywmZyAtvxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dOct7CStpkGB5OoxHbCRXaLeYZCO+IcLVX+M1wowN2vM+rBeu/4vbmByHM+JIjA2m bDMuJwSR6CY27Ii5/YF3D4amIcdKgxrFRJBiwQ0QrslWc5CAcAK+00IKx+IZGY6jGf mRHUgRFCK7fYKGZPHcDBWdo8uroigsRjh4ljFQR8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vaibhav Jain , Michael Ellerman Subject: [PATCH 5.5 071/120] powerpc/papr_scm: Fix leaking bus_desc.provider_name in some paths Date: Thu, 13 Feb 2020 07:21:07 -0800 Message-Id: <20200213151925.387634339@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200213151901.039700531@linuxfoundation.org> References: <20200213151901.039700531@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vaibhav Jain commit 5649607a8d0b0e019a4db14aab3de1e16c3a2b4f upstream. String 'bus_desc.provider_name' allocated inside papr_scm_nvdimm_init() will leaks in case call to nvdimm_bus_register() fails or when papr_scm_remove() is called. This minor patch ensures that 'bus_desc.provider_name' is freed in error path for nvdimm_bus_register() as well as in papr_scm_remove(). Fixes: b5beae5e224f ("powerpc/pseries: Add driver for PAPR SCM regions") Signed-off-by: Vaibhav Jain Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20200122155140.120429-1-vaibhav@linux.ibm.com Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/platforms/pseries/papr_scm.c | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/powerpc/platforms/pseries/papr_scm.c +++ b/arch/powerpc/platforms/pseries/papr_scm.c @@ -322,6 +322,7 @@ static int papr_scm_nvdimm_init(struct p p->bus = nvdimm_bus_register(NULL, &p->bus_desc); if (!p->bus) { dev_err(dev, "Error creating nvdimm bus %pOF\n", p->dn); + kfree(p->bus_desc.provider_name); return -ENXIO; } @@ -477,6 +478,7 @@ static int papr_scm_remove(struct platfo nvdimm_bus_unregister(p->bus); drc_pmem_unbind(p); + kfree(p->bus_desc.provider_name); kfree(p); return 0;