Skip to contentSkip to conversation

mfd: intel_quark_i2c_gpio: remove clock tree on error path

PATCH Applied Andy Shevchenko 3 participants 10 messages Feb 19, 2016 – Mar 21, 2016

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

PATCH v2 1/2 mfd: intel_quark_i2c_gpio: remove clock tree on error path

There is a potential resource leak in case when ->probe() fails. We have to unregister and remove clock tree which is done here.

This is a follow up to previously pushed commit c4726abce63b ("mfd:
intel_quark_i2c_gpio: Use clkdev_create()") that prevents double free() when clkdev_drop() followed by kfree() in devm_kcalloc() release stage.

I leave Fixes tag here, but the backporting will require to backport the commit c4726abce63b ("mfd: intel_quark_i2c_gpio: Use clkdev_create()") first.

Fixes 60ae5b9f5cdd (mfd: intel_quark_i2c_gpio: Add Intel Quark X1000 I2C-GPIO MFD Driver)

---
v2:
- do not unregister clock before lookup (Stephen)

 drivers/mfd/intel_quark_i2c_gpio.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/mfd/intel_quark_i2c_gpio.c +17 -8
index bdc5e27..7450f5d 100644
@@ -139,6 +139,7 @@ static int intel_quark_register_i2c_clk(struct intel_quark_mfd *quark_mfd)
 						INTEL_QUARK_I2C_CONTROLLER_CLK);
 
 	if (!quark_mfd->i2c_clk_lookup) {
+		clk_unregister(quark_mfd->i2c_clk);
 		dev_err(&pdev->dev, "Fixed clk register failed\n");
 		return -ENOMEM;
 	}
@@ -150,7 +151,7 @@ static void intel_quark_unregister_i2c_clk(struct pci_dev *pdev)
 {
 	struct intel_quark_mfd *quark_mfd = dev_get_drvdata(&pdev->dev);
 
-	if (!quark_mfd->i2c_clk || !quark_mfd->i2c_clk_lookup)
+	if (!quark_mfd->i2c_clk_lookup)
 		return;
 
 	clkdev_drop(quark_mfd->i2c_clk_lookup);
@@ -246,25 +247,33 @@ static int intel_quark_mfd_probe(struct pci_dev *pdev,
 	quark_mfd = devm_kzalloc(&pdev->dev, sizeof(*quark_mfd), GFP_KERNEL);
 	if (!quark_mfd)
 		return -ENOMEM;
+
 	quark_mfd->pdev = pdev;
+	dev_set_drvdata(&pdev->dev, quark_mfd);
 
 	ret = intel_quark_register_i2c_clk(quark_mfd);
 	if (ret)
 		return ret;
 
-	dev_set_drvdata(&pdev->dev, quark_mfd);
-
 	ret = intel_quark_i2c_setup(pdev, &intel_quark_mfd_cells[1]);
 	if (ret)
-		return ret;
+		goto err_unregister_i2c_clk;
 
 	ret = intel_quark_gpio_setup(pdev, &intel_quark_mfd_cells[0]);
 	if (ret)
-		return ret;
+		goto err_unregister_i2c_clk;
 
-	return mfd_add_devices(&pdev->dev, 0, intel_quark_mfd_cells,
-			       ARRAY_SIZE(intel_quark_mfd_cells), NULL, 0,
-			       NULL);
+	ret = mfd_add_devices(&pdev->dev, 0, intel_quark_mfd_cells,
+			      ARRAY_SIZE(intel_quark_mfd_cells), NULL, 0,
+			      NULL);
+	if (ret)
+		goto err_unregister_i2c_clk;
+
+	return 0;
+
+err_unregister_i2c_clk:
+	intel_quark_unregister_i2c_clk(pdev);
+	return ret;
 }
 
 static void intel_quark_mfd_remove(struct pci_dev *pdev)
Signature · 1 line
2.7.0
#1 lore raw

PATCH v2 2/2 mfd: intel_quark_i2c_gpio: switch to use struct device *

There is no need to pass struct pci_dev * to intel_quark_register_i2c_clk() and intel_quark_unregister_i2c_clk(). Change the parameter to struct device *. As a result store it in the private struct instead of struct pci_dev *.

---
 drivers/mfd/intel_quark_i2c_gpio.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/mfd/intel_quark_i2c_gpio.c +11 -11
index 7450f5d..24c2d29 100644
@@ -53,7 +53,7 @@
 #define INTEL_QUARK_I2C_CLK_HZ	33000000
 
 struct intel_quark_mfd {
-	struct pci_dev		*pdev;
+	struct device		*dev;
 	struct clk		*i2c_clk;
 	struct clk_lookup	*i2c_clk_lookup;
 };
@@ -123,12 +123,12 @@ static const struct pci_device_id intel_quark_mfd_ids[] = {
 };
 MODULE_DEVICE_TABLE(pci, intel_quark_mfd_ids);
 
-static int intel_quark_register_i2c_clk(struct intel_quark_mfd *quark_mfd)
+static int intel_quark_register_i2c_clk(struct device *dev)
 {
-	struct pci_dev *pdev = quark_mfd->pdev;
+	struct intel_quark_mfd *quark_mfd = dev_get_drvdata(dev);
 	struct clk *i2c_clk;
 
-	i2c_clk = clk_register_fixed_rate(&pdev->dev,
+	i2c_clk = clk_register_fixed_rate(dev,
 					  INTEL_QUARK_I2C_CONTROLLER_CLK, NULL,
 					  CLK_IS_ROOT, INTEL_QUARK_I2C_CLK_HZ);
 	if (IS_ERR(i2c_clk))
@@ -140,16 +140,16 @@ static int intel_quark_register_i2c_clk(struct intel_quark_mfd *quark_mfd)
 
 	if (!quark_mfd->i2c_clk_lookup) {
 		clk_unregister(quark_mfd->i2c_clk);
-		dev_err(&pdev->dev, "Fixed clk register failed\n");
+		dev_err(dev, "Fixed clk register failed\n");
 		return -ENOMEM;
 	}
 
 	return 0;
 }
 
-static void intel_quark_unregister_i2c_clk(struct pci_dev *pdev)
+static void intel_quark_unregister_i2c_clk(struct device *dev)
 {
-	struct intel_quark_mfd *quark_mfd = dev_get_drvdata(&pdev->dev);
+	struct intel_quark_mfd *quark_mfd = dev_get_drvdata(dev);
 
 	if (!quark_mfd->i2c_clk_lookup)
 		return;
@@ -248,10 +248,10 @@ static int intel_quark_mfd_probe(struct pci_dev *pdev,
 	if (!quark_mfd)
 		return -ENOMEM;
 
-	quark_mfd->pdev = pdev;
+	quark_mfd->dev = &pdev->dev;
 	dev_set_drvdata(&pdev->dev, quark_mfd);
 
-	ret = intel_quark_register_i2c_clk(quark_mfd);
+	ret = intel_quark_register_i2c_clk(&pdev->dev);
 	if (ret)
 		return ret;
 
@@ -272,13 +272,13 @@ static int intel_quark_mfd_probe(struct pci_dev *pdev,
 	return 0;
 
 err_unregister_i2c_clk:
-	intel_quark_unregister_i2c_clk(pdev);
+	intel_quark_unregister_i2c_clk(&pdev->dev);
 	return ret;
 }
 
 static void intel_quark_mfd_remove(struct pci_dev *pdev)
 {
-	intel_quark_unregister_i2c_clk(pdev);
+	intel_quark_unregister_i2c_clk(&pdev->dev);
 	mfd_remove_devices(&pdev->dev);
 }
 
Signature · 1 line
2.7.0
Applied
#2 lore raw

Re: [PATCH v2 2/2] mfd: intel_quark_i2c_gpio: switch to use struct device *

Quoted 8 lines · Andy Shevchenko

There is no need to pass struct pci_dev * to intel_quark_register_i2c_clk() and intel_quark_unregister_i2c_clk(). Change the parameter to struct device *. As a result store it in the private struct instead of struct pci_dev *.

---
 drivers/mfd/intel_quark_i2c_gpio.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

Applied, thanks.

Quoted 78 lines
drivers/mfd/intel_quark_i2c_gpio.c +11 -11
index 7450f5d..24c2d29 100644
@@ -53,7 +53,7 @@
 #define INTEL_QUARK_I2C_CLK_HZ	33000000
 
 struct intel_quark_mfd {
-	struct pci_dev		*pdev;
+	struct device		*dev;
 	struct clk		*i2c_clk;
 	struct clk_lookup	*i2c_clk_lookup;
 };
@@ -123,12 +123,12 @@ static const struct pci_device_id intel_quark_mfd_ids[] = {
 };
 MODULE_DEVICE_TABLE(pci, intel_quark_mfd_ids);
 
-static int intel_quark_register_i2c_clk(struct intel_quark_mfd *quark_mfd)
+static int intel_quark_register_i2c_clk(struct device *dev)
 {
-	struct pci_dev *pdev = quark_mfd->pdev;
+	struct intel_quark_mfd *quark_mfd = dev_get_drvdata(dev);
 	struct clk *i2c_clk;
 
-	i2c_clk = clk_register_fixed_rate(&pdev->dev,
+	i2c_clk = clk_register_fixed_rate(dev,
 					  INTEL_QUARK_I2C_CONTROLLER_CLK, NULL,
 					  CLK_IS_ROOT, INTEL_QUARK_I2C_CLK_HZ);
 	if (IS_ERR(i2c_clk))
@@ -140,16 +140,16 @@ static int intel_quark_register_i2c_clk(struct intel_quark_mfd *quark_mfd)
 
 	if (!quark_mfd->i2c_clk_lookup) {
 		clk_unregister(quark_mfd->i2c_clk);
-		dev_err(&pdev->dev, "Fixed clk register failed\n");
+		dev_err(dev, "Fixed clk register failed\n");
 		return -ENOMEM;
 	}
 
 	return 0;
 }
 
-static void intel_quark_unregister_i2c_clk(struct pci_dev *pdev)
+static void intel_quark_unregister_i2c_clk(struct device *dev)
 {
-	struct intel_quark_mfd *quark_mfd = dev_get_drvdata(&pdev->dev);
+	struct intel_quark_mfd *quark_mfd = dev_get_drvdata(dev);
 
 	if (!quark_mfd->i2c_clk_lookup)
 		return;
@@ -248,10 +248,10 @@ static int intel_quark_mfd_probe(struct pci_dev *pdev,
 	if (!quark_mfd)
 		return -ENOMEM;
 
-	quark_mfd->pdev = pdev;
+	quark_mfd->dev = &pdev->dev;
 	dev_set_drvdata(&pdev->dev, quark_mfd);
 
-	ret = intel_quark_register_i2c_clk(quark_mfd);
+	ret = intel_quark_register_i2c_clk(&pdev->dev);
 	if (ret)
 		return ret;
 
@@ -272,13 +272,13 @@ static int intel_quark_mfd_probe(struct pci_dev *pdev,
 	return 0;
 
 err_unregister_i2c_clk:
-	intel_quark_unregister_i2c_clk(pdev);
+	intel_quark_unregister_i2c_clk(&pdev->dev);
 	return ret;
 }
 
 static void intel_quark_mfd_remove(struct pci_dev *pdev)
 {
-	intel_quark_unregister_i2c_clk(pdev);
+	intel_quark_unregister_i2c_clk(&pdev->dev);
 	mfd_remove_devices(&pdev->dev);
 }
 
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#3 lore raw
In reply to Andy Shevchenko
Quoted 7 lines · Andy Shevchenko

There is a potential resource leak in case when ->probe() fails. We have to unregister and remove clock tree which is done here.

This is a follow up to previously pushed commit c4726abce63b ("mfd:
intel_quark_i2c_gpio: Use clkdev_create()") that prevents double free() when clkdev_drop() followed by kfree() in devm_kcalloc() release stage.

Quoted 7 lines

I leave Fixes tag here, but the backporting will require to backport the commit c4726abce63b ("mfd: intel_quark_i2c_gpio: Use clkdev_create()") first.

Fixes 60ae5b9f5cdd (mfd: intel_quark_i2c_gpio: Add Intel Quark X1000 I2C-GPIO MFD Driver)

---

Both look fine to me. You may also want to use devm_clk_register() instead so that cleanup is easier.

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
#4 lore raw
Quoted 15 lines · Stephen Boyd
Quoted 14 lines · Andy Shevchenko

There is a potential resource leak in case when ->probe() fails. We have to
unregister and remove clock tree which is done here.

This is a follow up to previously pushed commit c4726abce63b ("mfd:
intel_quark_i2c_gpio: Use clkdev_create()") that prevents double free() when
clkdev_drop() followed by kfree() in devm_kcalloc() release stage.

I leave Fixes tag here, but the backporting will require to backport the commit
c4726abce63b ("mfd: intel_quark_i2c_gpio: Use clkdev_create()") first.

Quoted 7 lines
Quoted 5 lines
Fixes 60ae5b9f5cdd (mfd: intel_quark_i2c_gpio: Add Intel Quark

X1000 I2C-GPIO MFD Driver)

---

Both look fine to me.

Thanks for review!

Quoted 2 lines

You may also want to use
devm_clk_register() instead so that cleanup is easier.

Perhaps in the future.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#5 lore raw
In reply to Stephen Boyd
Quoted 11 lines · Stephen Boyd
Quoted 10 lines · Andy Shevchenko

There is a potential resource leak in case when ->probe() fails. We have to unregister and remove clock tree which is done here.

This is a follow up to previously pushed commit c4726abce63b ("mfd:
intel_quark_i2c_gpio: Use clkdev_create()") that prevents double free() when clkdev_drop() followed by kfree() in devm_kcalloc() release stage.

I leave Fixes tag here, but the backporting will require to backport the commit c4726abce63b ("mfd: intel_quark_i2c_gpio: Use clkdev_create()") first.

Quoted 7 lines
Quoted 4 lines
Fixes 60ae5b9f5cdd (mfd: intel_quark_i2c_gpio: Add Intel Quark X1000 I2C-GPIO MFD Driver)

---

Both look fine to me. You may also want to use devm_clk_register() instead so that cleanup is easier.

I'm going to apply your Ack in order to show that you've seen and have no problems with the patch.

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#6 lore raw
Quoted 7 lines · Lee Jones
Quoted 3 lines · Stephen Boyd

Both look fine to me. You may also want to use devm_clk_register() instead so that cleanup is easier.

I'm going to apply your Ack in order to show that you've seen and have no problems with the patch.

Ok, thanks.

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
#7 lore raw
In reply to Andy Shevchenko
Quoted 9 lines · Andy Shevchenko

There is a potential resource leak in case when ->probe() fails. We have to
unregister and remove clock tree which is done here.

This is a follow up to previously pushed commit c4726abce63b ("mfd:
intel_quark_i2c_gpio: Use clkdev_create()") that prevents double free() when
clkdev_drop() followed by kfree() in devm_kcalloc() release stage.

Quoted 4 lines

I leave Fixes tag here, but the backporting will require to backport the commit
c4726abce63b ("mfd: intel_quark_i2c_gpio: Use clkdev_create()") first.

Lee, ping?

Quoted 84 lines
Fixes 60ae5b9f5cdd (mfd: intel_quark_i2c_gpio: Add Intel Quark X1000

I2C-GPIO MFD Driver)

---
v2:
- do not unregister clock before lookup (Stephen) drivers/mfd/intel_quark_i2c_gpio.c | 25 +++++++++++++++++--------

 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/mfd/intel_quark_i2c_gpio.c +0 -0
index bdc5e27..7450f5d 100644
@@ -139,6 +139,7 @@ static int intel_quark_register_i2c_clk(struct
 intel_quark_mfd *quark_mfd)

  INTEL_QUARK_I2C_CONT ROLLER_CLK);

  if (!quark_mfd->i2c_clk_lookup) {

drivers/mfd/intel_quark_i2c_gpio.c +1 -0
+		clk_unregister(quark_mfd->i2c_clk);

  dev_err(&pdev->dev, "Fixed clk register failed\n"); return -ENOMEM;
  }

drivers/mfd/intel_quark_i2c_gpio.c +0 -0
@@ -150,7 +151,7 @@ static void intel_quark_unregister_i2c_clk(struct
 pci_dev *pdev)
  {

  struct intel_quark_mfd *quark_mfd = dev_get_drvdata(&pdev-

Quoted 1 line

dev);

drivers/mfd/intel_quark_i2c_gpio.c +1 -1
-	if (!quark_mfd->i2c_clk || !quark_mfd->i2c_clk_lookup)
+	if (!quark_mfd->i2c_clk_lookup)

  return;

  clkdev_drop(quark_mfd->i2c_clk_lookup);

drivers/mfd/intel_quark_i2c_gpio.c +2 -0
@@ -246,25 +247,33 @@ static int intel_quark_mfd_probe(struct pci_dev
 *pdev,
  	quark_mfd = devm_kzalloc(&pdev->dev, sizeof(*quark_mfd),
 GFP_KERNEL);
  	if (!quark_mfd)
  		return -ENOMEM;
+
  	quark_mfd->pdev = pdev;
+	dev_set_drvdata(&pdev->dev, quark_mfd);


  ret = intel_quark_register_i2c_clk(quark_mfd); if (ret)
  return ret;

drivers/mfd/intel_quark_i2c_gpio.c +0 -2
-	dev_set_drvdata(&pdev->dev, quark_mfd);
-

  ret = intel_quark_i2c_setup(pdev,
&intel_quark_mfd_cells[1]);
  if (ret)

drivers/mfd/intel_quark_i2c_gpio.c +1 -1
-		return ret;
+		goto err_unregister_i2c_clk;


  ret = intel_quark_gpio_setup(pdev,
&intel_quark_mfd_cells[0]);
  if (ret)

drivers/mfd/intel_quark_i2c_gpio.c +1 -1
-		return ret;
+		goto err_unregister_i2c_clk;

drivers/mfd/intel_quark_i2c_gpio.c +0 -2
-	return mfd_add_devices(&pdev->dev, 0, intel_quark_mfd_cells,
-			       ARRAY_SIZE(intel_quark_mfd_cells),

NULL, 0,

drivers/mfd/intel_quark_i2c_gpio.c +2 -1
-			       NULL);
+	ret = mfd_add_devices(&pdev->dev, 0, intel_quark_mfd_cells,
+			      ARRAY_SIZE(intel_quark_mfd_cells),

NULL, 0,

drivers/mfd/intel_quark_i2c_gpio.c +9 -0
+			      NULL);
+	if (ret)
+		goto err_unregister_i2c_clk;
+
+	return 0;
+
+err_unregister_i2c_clk:
+	intel_quark_unregister_i2c_clk(pdev);
+	return ret;

 }

 static void intel_quark_mfd_remove(struct pci_dev *pdev)

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#8 lore raw
Quoted 10 lines · Andy Shevchenko
Quoted 9 lines · Andy Shevchenko

There is a potential resource leak in case when ->probe() fails. We have to
unregister and remove clock tree which is done here.

This is a follow up to previously pushed commit c4726abce63b ("mfd:
intel_quark_i2c_gpio: Use clkdev_create()") that prevents double free() when
clkdev_drop() followed by kfree() in devm_kcalloc() release stage.

Quoted 6 lines
Quoted 4 lines

I leave Fixes tag here, but the backporting will require to backport the commit
c4726abce63b ("mfd: intel_quark_i2c_gpio: Use clkdev_create()") first.

Lee, ping?

Pings don't serve any purpose but to irritate. This patch hasn't been forgotten, it's in the pile.

The last few weeks have been pretty crazy. Please bear with me while I play catch-up.

Quoted 84 lines
Quoted 83 lines
Fixes 60ae5b9f5cdd (mfd: intel_quark_i2c_gpio: Add Intel Quark X1000

I2C-GPIO MFD Driver)

---
v2:
- do not unregister clock before lookup (Stephen) drivers/mfd/intel_quark_i2c_gpio.c | 25 +++++++++++++++++--------

 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/mfd/intel_quark_i2c_gpio.c +0 -0
index bdc5e27..7450f5d 100644
@@ -139,6 +139,7 @@ static int intel_quark_register_i2c_clk(struct
 intel_quark_mfd *quark_mfd)

  INTEL_QUARK_I2C_CONT ROLLER_CLK);

  if (!quark_mfd->i2c_clk_lookup) {

drivers/mfd/intel_quark_i2c_gpio.c +1 -0
+		clk_unregister(quark_mfd->i2c_clk);

  dev_err(&pdev->dev, "Fixed clk register failed\n"); return -ENOMEM;
  }

drivers/mfd/intel_quark_i2c_gpio.c +0 -0
@@ -150,7 +151,7 @@ static void intel_quark_unregister_i2c_clk(struct
 pci_dev *pdev)
  {

  struct intel_quark_mfd *quark_mfd = dev_get_drvdata(&pdev-

Quoted 1 line

dev);

drivers/mfd/intel_quark_i2c_gpio.c +1 -1
-	if (!quark_mfd->i2c_clk || !quark_mfd->i2c_clk_lookup)
+	if (!quark_mfd->i2c_clk_lookup)

  return;

  clkdev_drop(quark_mfd->i2c_clk_lookup);

drivers/mfd/intel_quark_i2c_gpio.c +2 -0
@@ -246,25 +247,33 @@ static int intel_quark_mfd_probe(struct pci_dev
 *pdev,
  	quark_mfd = devm_kzalloc(&pdev->dev, sizeof(*quark_mfd),
 GFP_KERNEL);
  	if (!quark_mfd)
  		return -ENOMEM;
+
  	quark_mfd->pdev = pdev;
+	dev_set_drvdata(&pdev->dev, quark_mfd);


  ret = intel_quark_register_i2c_clk(quark_mfd); if (ret)
  return ret;

drivers/mfd/intel_quark_i2c_gpio.c +0 -2
-	dev_set_drvdata(&pdev->dev, quark_mfd);
-

  ret = intel_quark_i2c_setup(pdev,
&intel_quark_mfd_cells[1]);
  if (ret)

drivers/mfd/intel_quark_i2c_gpio.c +1 -1
-		return ret;
+		goto err_unregister_i2c_clk;


  ret = intel_quark_gpio_setup(pdev,
&intel_quark_mfd_cells[0]);
  if (ret)

drivers/mfd/intel_quark_i2c_gpio.c +1 -1
-		return ret;
+		goto err_unregister_i2c_clk;

drivers/mfd/intel_quark_i2c_gpio.c +0 -2
-	return mfd_add_devices(&pdev->dev, 0, intel_quark_mfd_cells,
-			       ARRAY_SIZE(intel_quark_mfd_cells),

NULL, 0,

drivers/mfd/intel_quark_i2c_gpio.c +2 -1
-			       NULL);
+	ret = mfd_add_devices(&pdev->dev, 0, intel_quark_mfd_cells,
+			      ARRAY_SIZE(intel_quark_mfd_cells),

NULL, 0,

drivers/mfd/intel_quark_i2c_gpio.c +9 -0
+			      NULL);
+	if (ret)
+		goto err_unregister_i2c_clk;
+
+	return 0;
+
+err_unregister_i2c_clk:
+	intel_quark_unregister_i2c_clk(pdev);
+	return ret;

 }

 static void intel_quark_mfd_remove(struct pci_dev *pdev)

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Applied
#9 lore raw
In reply to Andy Shevchenko
Quoted 10 lines · Andy Shevchenko

There is a potential resource leak in case when ->probe() fails. We have to unregister and remove clock tree which is done here.

This is a follow up to previously pushed commit c4726abce63b ("mfd:
intel_quark_i2c_gpio: Use clkdev_create()") that prevents double free() when clkdev_drop() followed by kfree() in devm_kcalloc() release stage.

I leave Fixes tag here, but the backporting will require to backport the commit c4726abce63b ("mfd: intel_quark_i2c_gpio: Use clkdev_create()") first.

Quoted 8 lines
Fixes 60ae5b9f5cdd (mfd: intel_quark_i2c_gpio: Add Intel Quark X1000 I2C-GPIO MFD Driver)

---
v2:
- do not unregister clock before lookup (Stephen)

 drivers/mfd/intel_quark_i2c_gpio.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

Applied, thanks.

Quoted 62 lines
drivers/mfd/intel_quark_i2c_gpio.c +17 -8
index bdc5e27..7450f5d 100644
@@ -139,6 +139,7 @@ static int intel_quark_register_i2c_clk(struct intel_quark_mfd *quark_mfd)
 						INTEL_QUARK_I2C_CONTROLLER_CLK);
 
 	if (!quark_mfd->i2c_clk_lookup) {
+		clk_unregister(quark_mfd->i2c_clk);
 		dev_err(&pdev->dev, "Fixed clk register failed\n");
 		return -ENOMEM;
 	}
@@ -150,7 +151,7 @@ static void intel_quark_unregister_i2c_clk(struct pci_dev *pdev)
 {
 	struct intel_quark_mfd *quark_mfd = dev_get_drvdata(&pdev->dev);
 
-	if (!quark_mfd->i2c_clk || !quark_mfd->i2c_clk_lookup)
+	if (!quark_mfd->i2c_clk_lookup)
 		return;
 
 	clkdev_drop(quark_mfd->i2c_clk_lookup);
@@ -246,25 +247,33 @@ static int intel_quark_mfd_probe(struct pci_dev *pdev,
 	quark_mfd = devm_kzalloc(&pdev->dev, sizeof(*quark_mfd), GFP_KERNEL);
 	if (!quark_mfd)
 		return -ENOMEM;
+
 	quark_mfd->pdev = pdev;
+	dev_set_drvdata(&pdev->dev, quark_mfd);
 
 	ret = intel_quark_register_i2c_clk(quark_mfd);
 	if (ret)
 		return ret;
 
-	dev_set_drvdata(&pdev->dev, quark_mfd);
-
 	ret = intel_quark_i2c_setup(pdev, &intel_quark_mfd_cells[1]);
 	if (ret)
-		return ret;
+		goto err_unregister_i2c_clk;
 
 	ret = intel_quark_gpio_setup(pdev, &intel_quark_mfd_cells[0]);
 	if (ret)
-		return ret;
+		goto err_unregister_i2c_clk;
 
-	return mfd_add_devices(&pdev->dev, 0, intel_quark_mfd_cells,
-			       ARRAY_SIZE(intel_quark_mfd_cells), NULL, 0,
-			       NULL);
+	ret = mfd_add_devices(&pdev->dev, 0, intel_quark_mfd_cells,
+			      ARRAY_SIZE(intel_quark_mfd_cells), NULL, 0,
+			      NULL);
+	if (ret)
+		goto err_unregister_i2c_clk;
+
+	return 0;
+
+err_unregister_i2c_clk:
+	intel_quark_unregister_i2c_clk(pdev);
+	return ret;
 }
 
 static void intel_quark_mfd_remove(struct pci_dev *pdev)
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog