Skip to contentSkip to conversation

platform/x86: int3472: Don't leak reference on error

PATCH RESEND Applied Andy Shevchenko 2 participants 2 messages Oct 4, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 platform/x86: int3472: Don't leak reference on error

The for_each_acpi_consumer_dev() takes a reference to the iterator and if we break a loop we must drop that reference. This usually happens when error handling is involved. However it's not the case for skl_int3472_fill_clk_pdata().

Don't leak reference on error by dropping it properly.

Fixes 43cf36974d76 ("platform/x86: int3472: Support multiple clock consumers")

---

resent to include Rafael and linux-acpi@ to the Cc list

 drivers/platform/x86/intel/int3472/tps68470.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/platform/x86/intel/int3472/tps68470.c +3 -3
index f83e9c393f31..5b8d1a9620a5 100644
@@ -128,15 +128,15 @@ skl_int3472_fill_clk_pdata(struct device *dev, struct tps68470_clk_platform_data
 	for_each_acpi_consumer_dev(adev, consumer) {
 		sensor_name = devm_kasprintf(dev, GFP_KERNEL, I2C_DEV_NAME_FORMAT,
 					     acpi_dev_name(consumer));
-		if (!sensor_name)
+		if (!sensor_name) {
+			acpi_dev_put(consumer);
 			return -ENOMEM;
+		}
 
 		(*clk_pdata)->consumers[i].consumer_dev_name = sensor_name;
 		i++;
 	}
 
-	acpi_dev_put(consumer);
-
 	return n_consumers;
 }
 
Signature · 1 line
2.35.1
maintainer Applied
#1 lore raw
Quoted 31 lines · Andy Shevchenko

The for_each_acpi_consumer_dev() takes a reference to the iterator and if we break a loop we must drop that reference. This usually happens when error handling is involved. However it's not the case for skl_int3472_fill_clk_pdata().

Don't leak reference on error by dropping it properly.

Fixes 43cf36974d76 ("platform/x86: int3472: Support multiple clock consumers")

---

resent to include Rafael and linux-acpi@ to the Cc list

 drivers/platform/x86/intel/int3472/tps68470.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/platform/x86/intel/int3472/tps68470.c +3 -1
index f83e9c393f31..5b8d1a9620a5 100644
@@ -128,15 +128,15 @@ skl_int3472_fill_clk_pdata(struct device *dev, struct tps68470_clk_platform_data
        for_each_acpi_consumer_dev(adev, consumer) {
                sensor_name = devm_kasprintf(dev, GFP_KERNEL, I2C_DEV_NAME_FORMAT,
                                             acpi_dev_name(consumer));
-               if (!sensor_name)
+               if (!sensor_name) {
+                       acpi_dev_put(consumer);
                        return -ENOMEM;
+               }
 

drivers/platform/x86/intel/int3472/tps68470.c skl_int3472_fill_clk_pdata(struct device *dev, struct tps68470_clk_platform_data

Quoted 10 lines
drivers/platform/x86/intel/int3472/tps68470.c +0 -3
                (*clk_pdata)->consumers[i].consumer_dev_name = sensor_name;
                i++;
        }
 
-       acpi_dev_put(consumer);
-
        return n_consumers;
 }
 
--

Applied, thanks!