From:   Ido Schimmel <idosch@nvidia.com>
To:     linux-pm@vger.kernel.org
Cc:     rafael@kernel.org, daniel.lezcano@linaro.org, amitk@kernel.org,
        rui.zhang@intel.com, vadimp@nvidia.com, mlxsw@nvidia.com,
        Ido Schimmel <idosch@nvidia.com>
Subject: [PATCH] thermal/of: Fix memory leak on thermal_of_zone_register() failure
Date:   Thu, 20 Oct 2022 13:36:58 +0300
Message-Id: <20221020103658.802457-1-idosch@nvidia.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2iN4cNwkWHGNTPKWGklvw4CR4sAgXQ68HEVtU5ACruto4DnUe+WHnvA17dAk?=
 =?us-ascii?Q?hdpaKCCIiJncXpFlcGyXrMxCmr2XIKgXzOAXE/+w+VfQVjLodAo7jYkBZXz/?=
 =?us-ascii?Q?uQlyEM/jhgqkiFODAyr9VIhEuq6DoC8tjdeAm7ni1nODNEk9JC8FGzdviFaB?=
 =?us-ascii?Q?77iSLSkZlpOKTIA/KpU4vkg8jZASN0tryNCMK+P4lqpjSTHkhVpPePngbdVf?=
 =?us-ascii?Q?yy7N7vCghGgn402pFouvCG5qp95EXE1O5Xzxe8r8zGjvUKbqFYb/b9nW2S0t?=
 =?us-ascii?Q?KH5VY9RZ8mKcSPCojdjp67E2Uxwiwaid1FqH1S29h69ZyZKII/VWTDZNWUCJ?=
 =?us-ascii?Q?wTJ6zW3o3IPh83lqa2zW6mUb+idPQ56vyjFSwCV5Uz4Etw6EexEYpZABYPKc?=
 =?us-ascii?Q?y55q8dubQaxQWqh6hHj+lDR7UpIrpUeSRQbMkHZq223oZMavjsaK2SV8agF6?=
 =?us-ascii?Q?tytYXeclXxcTTefPp0RcRnrCB6nipTU6+NdLLxAQ3Ch8juP04H/sY9ZbaSc3?=
 =?us-ascii?Q?1qJeATDaK6ACwz/g69TDnMdr+CI0jcfdyY/1IJ96RZzmmDzqtqb8n+XkXV2Y?=
 =?us-ascii?Q?pT+aHm4uAHmw8KA7O6flMyHRRQCFc3J/bnnl3asZPBnazMMF1h2vceHkSBND?=
 =?us-ascii?Q?kbZvexTZoc+4rdtjzHk7y+XHzuHCfn8P0EbjH46djKbVWjkAQcthu1XFqHmB?=
 =?us-ascii?Q?X3FcSBnHmPWSyUaIde5rWMOXKakci9cbFwGyE354CANwtsLG2pOWYk4RrDnG?=
 =?us-ascii?Q?ZLrIuaiMeQiSk3mMmlG6vuTrPd3H8CoZVYKNaUxrdfB+WTOHXfkCde+cE/an?=
 =?us-ascii?Q?KjV+nD9dtK/Fs9Gr4+1Vejs2LjziCgCijGYeTXlfnhCjg83AdHwNFtl55X0G?=
 =?us-ascii?Q?Rx6tRABeAobRUmGRDUgNnPX3CZHZ4kWazgfBCEWKN/flsXZi2sLUXYoB1Xxp?=
 =?us-ascii?Q?hGO/2n+nXf7qEvzwdyGKit2iLQV9BGl5nn2YUnWm+8HG+imDxZf5Z05mgFdM?=
 =?us-ascii?Q?OIXGI76scDQaA1HFVhnHP0uNFm6bVRXoax/6M7oG0m7LZ8Y1NOanQbpkHoU7?=
 =?us-ascii?Q?iNUcpQEAr9ApzKTpGQli+BbejmHnIO3yj1NurvaHwtmqn3UDOs8FKu8Lu2M4?=
 =?us-ascii?Q?suENHX2DUVQskvIO3hpNfm/l92sRVBHCAX5hRSerexfrZptFLMWm3kfUqodY?=
 =?us-ascii?Q?WdraBCQ8lJLmCnHXBHO+Zdn10VOMFT2UOP6nXGe92NfRujWpEcEWrM32ESb9?=
 =?us-ascii?Q?w+gSJ6X8IY/d4FZd6RVeon3ZXrbOklEt8MjEss+BHNFmyvLK/pFRllrKhJuc?=
 =?us-ascii?Q?cp/bU+AuVG/DY2v5tOWKxeFWi93VKErOewJ0TnpTpDXZktlKIkHHMsNeTWsQ?=
 =?us-ascii?Q?kBLes8tJi/qMpWMsnV7L0lvYtTn+Cz25/1edwOmbKg6UjJEQize3Rx93u/tO?=
 =?us-ascii?Q?Rhftbl/WIzZ/tbfYO+ofesjnnLM70ruRWvj7Zb/cfcASXPxwa5qSTwaKsGpb?=
 =?us-ascii?Q?+xi3PeabiZnEtMMgaBsqd6AIvDUaQycd3kvzpn9u3BtAjbBf9QBdQcLHxc0b?=
 =?us-ascii?Q?7IgxP6+f6KSckp8+OUoAi0lKD+I3LAOBHPLFWHNl?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0fe3550e-21b2-40d6-a905-08dab2870f22
X-MS-Exchange-CrossTenant-AuthSource: CY5PR12MB6179.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 10:37:17.2496
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 0ecdhRUbI8ouOGI5mFzul6SjOni2/34BnFCOZvCmd2ICdA5oSlDJ0E72ukoiZRA2gkdKT6YMXcCPbRTtCdMTSQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5132
Precedence: bulk
List-ID: <linux-pm.vger.kernel.org>
X-Mailing-List: linux-pm@vger.kernel.org

The function does not free 'of_ops' upon failure, leading to a memory
leak [1].

Fix by freeing 'of_ops' in the error path.

[1]
unreferenced object 0xffff8ee846198c80 (size 128):
  comm "swapper/0", pid 1, jiffies 4294699704 (age 70.076s)
  hex dump (first 32 bytes):
    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
    d0 3f 6e 8c ff ff ff ff 00 00 00 00 00 00 00 00  .?n.............
  backtrace:
    [<00000000d136f562>] __kmalloc_node_track_caller+0x42/0x120
    [<0000000063f31678>] kmemdup+0x1d/0x40
    [<00000000e6d24096>] thermal_of_zone_register+0x49/0x520
    [<000000005e78c755>] devm_thermal_of_zone_register+0x54/0x90
    [<00000000ee6b209e>] pmbus_add_sensor+0x1b4/0x1d0
    [<00000000896105e3>] pmbus_add_sensor_attrs_one+0x123/0x440
    [<0000000049e990a6>] pmbus_add_sensor_attrs+0xfe/0x1d0
    [<00000000466b5440>] pmbus_do_probe+0x66b/0x14e0
    [<0000000084d42285>] i2c_device_probe+0x13b/0x2f0
    [<0000000029e2ae74>] really_probe+0xce/0x2c0
    [<00000000692df15c>] driver_probe_device+0x19/0xd0
    [<00000000547d9cce>] __device_attach_driver+0x6f/0x100
    [<0000000020abd24b>] bus_for_each_drv+0x76/0xc0
    [<00000000665d9563>] __device_attach+0xfc/0x180
    [<000000008ddd4d6a>] bus_probe_device+0x82/0xa0
    [<000000009e61132b>] device_add+0x3fe/0x920

Fixes: 3fd6d6e2b4e8 ("thermal/of: Rework the thermal device tree initialization")
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Vadim Pasternak <vadimp@nvidia.com>
---
 drivers/thermal/thermal_of.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
index d4b6335ace15..aacba30bc10c 100644
--- a/drivers/thermal/thermal_of.c
+++ b/drivers/thermal/thermal_of.c
@@ -604,13 +604,15 @@ struct thermal_zone_device *thermal_of_zone_register(struct device_node *sensor,
 	if (IS_ERR(np)) {
 		if (PTR_ERR(np) != -ENODEV)
 			pr_err("Failed to find thermal zone for %pOFn id=%d\n", sensor, id);
-		return ERR_CAST(np);
+		ret = PTR_ERR(np);
+		goto out_kfree_of_ops;
 	}
 
 	trips = thermal_of_trips_init(np, &ntrips);
 	if (IS_ERR(trips)) {
 		pr_err("Failed to find trip points for %pOFn id=%d\n", sensor, id);
-		return ERR_CAST(trips);
+		ret = PTR_ERR(trips);
+		goto out_kfree_of_ops;
 	}
 
 	ret = thermal_of_monitor_init(np, &delay, &pdelay);
@@ -659,6 +661,8 @@ struct thermal_zone_device *thermal_of_zone_register(struct device_node *sensor,
 	kfree(tzp);
 out_kfree_trips:
 	kfree(trips);
+out_kfree_of_ops:
+	kfree(of_ops);
 
 	return ERR_PTR(ret);
 }
-- 
2.37.3