Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp858036pxj; Sat, 8 May 2021 00:25:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypTEo4SXOcrzHKB9qCC87jjEgXkta6Qfw+e0/GzvUML0fWdAAYRisySh0NZWqyY8MAZpTA X-Received: by 2002:a63:e1d:: with SMTP id d29mr14812817pgl.175.1620458716707; Sat, 08 May 2021 00:25:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620458716; cv=none; d=google.com; s=arc-20160816; b=WXj/3ouzSBqm63M1H9hAGKmH2GqdZew4Njps3G0siUFsqYxdrJk56Us3HNvDVwVJL/ wW9JjyFwweyaonQ25X0Lewm/CuwB4PS7zLp+xmweymuBTXswhkL2qG/XoLfX/NrEfNQ6 r2Ls99fy/t84iFMIf4K3QWPBXYk7HA2WYvp5r6xGXE0j/L6ar53jqnaeKPnQGfqV4/Mq aS9pZh0ruWY5FfNkEIpYvCUDbpFbqgwsq25yIPXIjh8QyvLsdUG2QTaCmnh9xfeRv2N+ chk+ci8P4sxWNvwo1AcBYIdAbIhmJ5JqekedjuzrN+tTqsQoCXTDsrluvWDwd1C/Hw/s VZ6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=RMFv3Gd/QFZylIpkGXTH78xbW/nY76csY8nrWOPqcB8=; b=HD3vWbL+pHJ5bEHLHp2v3Gx4q69usIYtT22g1PpS3YYYBtmYVGH4PhwMT7P/E+LV2g XuFDJOx9Pjp3vV9R48HvewxQHYSLgxiM5nY8IYQ4oXv6LFD/A5Ttja10UOEIdf38fzWu o8Dqye2mOfujDFQIoT2cQNull5etI1QSVylwf6yTSKmFcERecTSyrgJHE5sO7fvRwJe+ E9WrHRCYb1/rriKvwR8bLf5UfmehL5mGgZBXfidu7TPtXjz6LCPogFVRVFDxSe6ZMATH ICFWvXp6r7DDSbGpXua8sdD4spn+e26w3I9gQhIaKZ5jj8ZA/5l/EwmvIEWKIlIfIFz+ IFMQ== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y20si9120494plc.424.2021.05.08.00.25.04; Sat, 08 May 2021 00:25:16 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229949AbhEHHYT (ORCPT + 99 others); Sat, 8 May 2021 03:24:19 -0400 Received: from smtp02.smtpout.orange.fr ([80.12.242.124]:45992 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229583AbhEHHYQ (ORCPT ); Sat, 8 May 2021 03:24:16 -0400 Received: from localhost.localdomain ([86.243.172.93]) by mwinf5d37 with ME id 27PA2500P21Fzsu037PBZZ; Sat, 08 May 2021 09:23:13 +0200 X-ME-Helo: localhost.localdomain X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 08 May 2021 09:23:13 +0200 X-ME-IP: 86.243.172.93 From: Christophe JAILLET To: rjw@rjwysocki.net, lenb@kernel.org, andriy.shevchenko@linux.intel.com Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH] ACPI: scan: Fix a memory leak in an error handling path Date: Sat, 8 May 2021 09:23:09 +0200 Message-Id: <63bf4e87eb42fa3fff2cd87eb605ebcc01f4b2f7.1620458525.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If 'acpi_device_set_name()' fails, we must free 'acpi_device_bus_id->bus_id' or there is a (potential) memory leak. 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