Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2568263pxj; Mon, 10 May 2021 06:06:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0luhYJpsMye8zuX7TI2FR0FBu0WMEK1NRfd3ZF+mNCmHGSGFtFHMFvwmyhTGveh5t55Xi X-Received: by 2002:a6b:b7c3:: with SMTP id h186mr18180474iof.14.1620652017891; Mon, 10 May 2021 06:06:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620652017; cv=none; d=google.com; s=arc-20160816; b=OcWorRm7h5KFRn3Tjv7Ba8r/gXji00JdQKvXqfdwUE+xC5wawTnV+RGIMPJeEzvLuL w5gF7113Ai7UEEuTDddq1EH6a9WoD7vbWX53kt8XbXgL3JeJfyWUG0nwdrKGfvt1T4h9 Ir+Te2Zc4jp2a4PcDJ9ciNMFd78tcdUmHMTke/zBjgSDXYjSmswrs1CPzpRBmofBiRFP 8DhajE8ZmLjIDmlkX6gJKOdNUQs6eMbelD5cBArrrfLCdlO4Mb9url+O9Z4J72y3UxvP s9YBGLuxOpaB/z7TuAkdyhRCu9n6DnrOZMWrE7e217NTlGBWwrR34wiu00ftFNN4FJyu P+MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:organization:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :ironport-sdr:ironport-sdr; bh=gGOLoOqATB5HVsvgSBWe0t+j5raaYGPXBDL6qAmGk7M=; b=cjETdsGfDaalywZQlpHUcZt9k/zS3bM0lexD+ZTfvME1ZF5eRhE+cr7jVItFWJyTTP YvtH29yKsPqKIt+h/47Mci/RyfalLdiT/wvRskIi4dzZHuErABav85TvH4fX88Ff8Pmr 43W0sHo1W1tSRCt8MSPx9GaWGjQgtvsWGXHAziDl3/P/9SEL0pyvgDUgsq/7dWVoGV6S VfKIZaMGHlcxUw26T6InnzP80pLDO/2FramjqC38mRtnLug+H4euH4UwHN9AHdkt2sS/ ytSnPf4JTSdl9MveD0xs+HV7LhM6PtSDLl7FxrUDuy0RP0uvHJ4wsAwmPcP9f6Oiiu3V dkOg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q10si13686034ilu.60.2021.05.10.06.06.45; Mon, 10 May 2021 06:06:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349807AbhEJMzD (ORCPT + 99 others); Mon, 10 May 2021 08:55:03 -0400 Received: from mga06.intel.com ([134.134.136.31]:30707 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243429AbhEJMTj (ORCPT ); Mon, 10 May 2021 08:19:39 -0400 IronPort-SDR: Evd8opFPGzhCVFT1ay/CUKsm3Tu+v47ZN2tc3UMlS7kshakAmpVo4VxpOkgu1dZQ+THJzUITPC glLbxSgFpqEg== X-IronPort-AV: E=McAfee;i="6200,9189,9979"; a="260444372" X-IronPort-AV: E=Sophos;i="5.82,286,1613462400"; d="scan'208";a="260444372" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2021 05:18:24 -0700 IronPort-SDR: IRU+4kJB9UCczVymR3GBVIkbepiApWDkwC6FafTPRDfJ6V8R8VbqaIbgHlKguFrqphC+dNLBXo BWg7KDYnXWMg== X-IronPort-AV: E=Sophos;i="5.82,287,1613462400"; d="scan'208";a="468101379" Received: from smile.fi.intel.com (HELO smile) ([10.237.68.40]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2021 05:18:23 -0700 Received: from andy by smile with local (Exim 4.94) (envelope-from ) id 1lg4rc-00BAFN-NV; Mon, 10 May 2021 15:18:20 +0300 Date: Mon, 10 May 2021 15:18:20 +0300 From: Andy Shevchenko To: Christophe JAILLET Cc: rjw@rjwysocki.net, lenb@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH] ACPI: scan: Fix a memory leak in an error handling path Message-ID: References: <63bf4e87eb42fa3fff2cd87eb605ebcc01f4b2f7.1620458525.git.christophe.jaillet@wanadoo.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <63bf4e87eb42fa3fff2cd87eb605ebcc01f4b2f7.1620458525.git.christophe.jaillet@wanadoo.fr> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, May 08, 2021 at 09:23:09AM +0200, Christophe JAILLET wrote: > If 'acpi_device_set_name()' fails, we must free > 'acpi_device_bus_id->bus_id' or there is a (potential) memory leak. Good catch! I guess I have lost it somewhere in the middle of developing the mentioned fix. Reviewed-by: Andy Shevchenko Thanks! > Fixes: eb50aaf960e3 ("ACPI: scan: Use unique number for instance_no") > Signed-off-by: Christophe JAILLET > --- > drivers/acpi/scan.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c > index a22778e880c2..651a431e2bbf 100644 > --- a/drivers/acpi/scan.c > +++ b/drivers/acpi/scan.c > @@ -700,6 +700,7 @@ int acpi_device_add(struct acpi_device *device, > > result = acpi_device_set_name(device, acpi_device_bus_id); > if (result) { > + kfree_const(acpi_device_bus_id->bus_id); > kfree(acpi_device_bus_id); > goto err_unlock; > } > -- > 2.30.2 > -- With Best Regards, Andy Shevchenko