From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 45DC325F7B7; Tue, 11 Mar 2025 15:19:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741706374; cv=none; b=kKdc9rDElVRTRAIjhE+7WRwpymPjKDV11AUfJjxxJlFmnPtLLJAxptUJGSE4FgLwMKM+Z8onx6/4ipTEeKNz/Xjr3paYXsjAFLIlsygb29YVbdtwdwPtpJ1t6SxXjcEOfmxb/ykODuo7yAxFzG5+EwnD1CcPBXj0nnz6v5A8NUs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741706374; c=relaxed/simple; bh=eFvzbBAbiLY4gMgXp/E0TzH8EsSvOteKlCdMa+D6rlY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RQKxJ5baAHkPdVBs1cx9BnwaYvOnEK2IxQI9jctcECmtECEA/6s+D2NVBiZ7I5CjNarpawPuUEBlG3tpsO+i4zWJimPpUat/ERma2v56wh7C9FvWHjbfkcOkFrjXynUaFHrqtiUgSxLf4fq2enmmJwnopzNc0d24gW4TuY1SRnI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=y0O8Z50E; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="y0O8Z50E" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BE170C4AF09; Tue, 11 Mar 2025 15:19:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741706374; bh=eFvzbBAbiLY4gMgXp/E0TzH8EsSvOteKlCdMa+D6rlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y0O8Z50EtQLaRW/pxuOWdPmMgg0LRJTAwwv3SomAUkEKdwnM60CKIatcomn/e8ND8 VbESTtB69VoCL66pyh3gC5CwfUjDFpyyoGg508cQsgxFP5aCBccdmt/ZjKpAks5sID ZqJRx8jplf18iwbgVE5LNvPS49Di3BVqGRo+rETk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Joe Hattori , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 5.10 027/462] ACPI: fan: cleanup resources in the error path of .probe() Date: Tue, 11 Mar 2025 15:54:53 +0100 Message-ID: <20250311145759.425250798@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250311145758.343076290@linuxfoundation.org> References: <20250311145758.343076290@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Joe Hattori [ Upstream commit c759bc8e9046f9812238f506d70f07d3ea4206d4 ] Call thermal_cooling_device_unregister() and sysfs_remove_link() in the error path of acpi_fan_probe() to fix possible memory leak. This bug was found by an experimental static analysis tool that I am developing. Fixes: 05a83d972293 ("ACPI: register ACPI Fan as generic thermal cooling device") Signed-off-by: Joe Hattori Link: https://patch.msgid.link/20241211032812.210164-1-joe@pf.is.s.u-tokyo.ac.jp Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/fan.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index 5cd0ceb50bc8a..936429e81d8c8 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c @@ -423,19 +423,25 @@ static int acpi_fan_probe(struct platform_device *pdev) result = sysfs_create_link(&pdev->dev.kobj, &cdev->device.kobj, "thermal_cooling"); - if (result) + if (result) { dev_err(&pdev->dev, "Failed to create sysfs link 'thermal_cooling'\n"); + goto err_unregister; + } result = sysfs_create_link(&cdev->device.kobj, &pdev->dev.kobj, "device"); if (result) { dev_err(&pdev->dev, "Failed to create sysfs link 'device'\n"); - goto err_end; + goto err_remove_link; } return 0; +err_remove_link: + sysfs_remove_link(&pdev->dev.kobj, "thermal_cooling"); +err_unregister: + thermal_cooling_device_unregister(cdev); err_end: if (fan->acpi4) { int i; -- 2.39.5