* [PATCH v3 1/3] i2c: muxes: i2c-mux-pinctrl: Use of_get_i2c_adapter_by_node()
[not found] <20231020153017.759926-1-herve.codina@bootlin.com>
@ 2023-10-20 15:30 ` Herve Codina
2023-10-21 17:57 ` Wolfram Sang
2023-10-20 15:30 ` [PATCH v3 2/3] i2c: muxes: i2c-demux-pinctrl: " Herve Codina
2023-10-20 15:30 ` [PATCH v3 3/3] i2c: muxes: i2c-mux-gpmux: " Herve Codina
2 siblings, 1 reply; 6+ messages in thread
From: Herve Codina @ 2023-10-20 15:30 UTC (permalink / raw)
To: Wolfram Sang, Peter Rosin, Stephen Warren, Rob Herring,
Greg Kroah-Hartman, Jonathan Cameron
Cc: Wolfram Sang, linux-i2c, linux-kernel, Allan Nielsen,
Horatiu Vultur, Steen Hegelund, Thomas Petazzoni, Herve Codina,
stable, Jonathan Cameron
i2c-mux-pinctrl uses the pair of_find_i2c_adapter_by_node() /
i2c_put_adapter(). These pair alone is not correct to properly lock the
I2C parent adapter.
Indeed, i2c_put_adapter() decrements the module refcount while
of_find_i2c_adapter_by_node() does not increment it. This leads to an
underflow of the parent module refcount.
Use the dedicated function, of_get_i2c_adapter_by_node(), to handle
correctly the module refcount.
Fixes: c4aee3e1b0de ("i2c: mux: pinctrl: remove platform_data")
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
Cc: stable@vger.kernel.org
Acked-by: Peter Rosin <peda@axentia.se>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/i2c/muxes/i2c-mux-pinctrl.c b/drivers/i2c/muxes/i2c-mux-pinctrl.c
index 18236b9fa14a..6ebca7bfd8a2 100644
--- a/drivers/i2c/muxes/i2c-mux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c
@@ -62,7 +62,7 @@ static struct i2c_adapter *i2c_mux_pinctrl_parent_adapter(struct device *dev)
dev_err(dev, "Cannot parse i2c-parent\n");
return ERR_PTR(-ENODEV);
}
- parent = of_find_i2c_adapter_by_node(parent_np);
+ parent = of_get_i2c_adapter_by_node(parent_np);
of_node_put(parent_np);
if (!parent)
return ERR_PTR(-EPROBE_DEFER);
--
2.41.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3 1/3] i2c: muxes: i2c-mux-pinctrl: Use of_get_i2c_adapter_by_node()
2023-10-20 15:30 ` [PATCH v3 1/3] i2c: muxes: i2c-mux-pinctrl: Use of_get_i2c_adapter_by_node() Herve Codina
@ 2023-10-21 17:57 ` Wolfram Sang
0 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2023-10-21 17:57 UTC (permalink / raw)
To: Herve Codina
Cc: Peter Rosin, Stephen Warren, Rob Herring, Greg Kroah-Hartman,
Jonathan Cameron, linux-i2c, linux-kernel, Allan Nielsen,
Horatiu Vultur, Steen Hegelund, Thomas Petazzoni, stable,
Jonathan Cameron
[-- Attachment #1: Type: text/plain, Size: 824 bytes --]
On Fri, Oct 20, 2023 at 05:30:11PM +0200, Herve Codina wrote:
> i2c-mux-pinctrl uses the pair of_find_i2c_adapter_by_node() /
> i2c_put_adapter(). These pair alone is not correct to properly lock the
> I2C parent adapter.
>
> Indeed, i2c_put_adapter() decrements the module refcount while
> of_find_i2c_adapter_by_node() does not increment it. This leads to an
> underflow of the parent module refcount.
>
> Use the dedicated function, of_get_i2c_adapter_by_node(), to handle
> correctly the module refcount.
>
> Fixes: c4aee3e1b0de ("i2c: mux: pinctrl: remove platform_data")
> Signed-off-by: Herve Codina <herve.codina@bootlin.com>
> Cc: stable@vger.kernel.org
> Acked-by: Peter Rosin <peda@axentia.se>
> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Applied to for-current, thanks!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 2/3] i2c: muxes: i2c-demux-pinctrl: Use of_get_i2c_adapter_by_node()
[not found] <20231020153017.759926-1-herve.codina@bootlin.com>
2023-10-20 15:30 ` [PATCH v3 1/3] i2c: muxes: i2c-mux-pinctrl: Use of_get_i2c_adapter_by_node() Herve Codina
@ 2023-10-20 15:30 ` Herve Codina
2023-10-21 17:57 ` Wolfram Sang
2023-10-20 15:30 ` [PATCH v3 3/3] i2c: muxes: i2c-mux-gpmux: " Herve Codina
2 siblings, 1 reply; 6+ messages in thread
From: Herve Codina @ 2023-10-20 15:30 UTC (permalink / raw)
To: Wolfram Sang, Peter Rosin, Stephen Warren, Rob Herring,
Greg Kroah-Hartman, Jonathan Cameron
Cc: Wolfram Sang, linux-i2c, linux-kernel, Allan Nielsen,
Horatiu Vultur, Steen Hegelund, Thomas Petazzoni, Herve Codina,
stable, Jonathan Cameron
i2c-demux-pinctrl uses the pair of_find_i2c_adapter_by_node() /
i2c_put_adapter(). These pair alone is not correct to properly lock the
I2C parent adapter.
Indeed, i2c_put_adapter() decrements the module refcount while
of_find_i2c_adapter_by_node() does not increment it. This leads to an
underflow of the parent module refcount.
Use the dedicated function, of_get_i2c_adapter_by_node(), to handle
correctly the module refcount.
Fixes: 50a5ba876908 ("i2c: mux: demux-pinctrl: add driver")
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
Cc: stable@vger.kernel.org
Acked-by: Peter Rosin <peda@axentia.se>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/i2c/muxes/i2c-demux-pinctrl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c
index 22f2280eab7f..9f2e4aa28159 100644
--- a/drivers/i2c/muxes/i2c-demux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c
@@ -61,7 +61,7 @@ static int i2c_demux_activate_master(struct i2c_demux_pinctrl_priv *priv, u32 ne
if (ret)
goto err;
- adap = of_find_i2c_adapter_by_node(priv->chan[new_chan].parent_np);
+ adap = of_get_i2c_adapter_by_node(priv->chan[new_chan].parent_np);
if (!adap) {
ret = -ENODEV;
goto err_with_revert;
--
2.41.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3 2/3] i2c: muxes: i2c-demux-pinctrl: Use of_get_i2c_adapter_by_node()
2023-10-20 15:30 ` [PATCH v3 2/3] i2c: muxes: i2c-demux-pinctrl: " Herve Codina
@ 2023-10-21 17:57 ` Wolfram Sang
0 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2023-10-21 17:57 UTC (permalink / raw)
To: Herve Codina
Cc: Peter Rosin, Stephen Warren, Rob Herring, Greg Kroah-Hartman,
Jonathan Cameron, linux-i2c, linux-kernel, Allan Nielsen,
Horatiu Vultur, Steen Hegelund, Thomas Petazzoni, stable,
Jonathan Cameron
[-- Attachment #1: Type: text/plain, Size: 822 bytes --]
On Fri, Oct 20, 2023 at 05:30:12PM +0200, Herve Codina wrote:
> i2c-demux-pinctrl uses the pair of_find_i2c_adapter_by_node() /
> i2c_put_adapter(). These pair alone is not correct to properly lock the
> I2C parent adapter.
>
> Indeed, i2c_put_adapter() decrements the module refcount while
> of_find_i2c_adapter_by_node() does not increment it. This leads to an
> underflow of the parent module refcount.
>
> Use the dedicated function, of_get_i2c_adapter_by_node(), to handle
> correctly the module refcount.
>
> Fixes: 50a5ba876908 ("i2c: mux: demux-pinctrl: add driver")
> Signed-off-by: Herve Codina <herve.codina@bootlin.com>
> Cc: stable@vger.kernel.org
> Acked-by: Peter Rosin <peda@axentia.se>
> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Applied to for-current, thanks!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 3/3] i2c: muxes: i2c-mux-gpmux: Use of_get_i2c_adapter_by_node()
[not found] <20231020153017.759926-1-herve.codina@bootlin.com>
2023-10-20 15:30 ` [PATCH v3 1/3] i2c: muxes: i2c-mux-pinctrl: Use of_get_i2c_adapter_by_node() Herve Codina
2023-10-20 15:30 ` [PATCH v3 2/3] i2c: muxes: i2c-demux-pinctrl: " Herve Codina
@ 2023-10-20 15:30 ` Herve Codina
2023-10-21 17:58 ` Wolfram Sang
2 siblings, 1 reply; 6+ messages in thread
From: Herve Codina @ 2023-10-20 15:30 UTC (permalink / raw)
To: Wolfram Sang, Peter Rosin, Stephen Warren, Rob Herring,
Greg Kroah-Hartman, Jonathan Cameron
Cc: Wolfram Sang, linux-i2c, linux-kernel, Allan Nielsen,
Horatiu Vultur, Steen Hegelund, Thomas Petazzoni, Herve Codina,
stable, Jonathan Cameron
i2c-mux-gpmux uses the pair of_find_i2c_adapter_by_node() /
i2c_put_adapter(). These pair alone is not correct to properly lock the
I2C parent adapter.
Indeed, i2c_put_adapter() decrements the module refcount while
of_find_i2c_adapter_by_node() does not increment it. This leads to an
underflow of the parent module refcount.
Use the dedicated function, of_get_i2c_adapter_by_node(), to handle
correctly the module refcount.
Fixes: ac8498f0ce53 ("i2c: i2c-mux-gpmux: new driver")
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
Cc: stable@vger.kernel.org
Acked-by: Peter Rosin <peda@axentia.se>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/i2c/muxes/i2c-mux-gpmux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/i2c/muxes/i2c-mux-gpmux.c b/drivers/i2c/muxes/i2c-mux-gpmux.c
index baccf4bfaf02..8305661e1253 100644
--- a/drivers/i2c/muxes/i2c-mux-gpmux.c
+++ b/drivers/i2c/muxes/i2c-mux-gpmux.c
@@ -52,7 +52,7 @@ static struct i2c_adapter *mux_parent_adapter(struct device *dev)
dev_err(dev, "Cannot parse i2c-parent\n");
return ERR_PTR(-ENODEV);
}
- parent = of_find_i2c_adapter_by_node(parent_np);
+ parent = of_get_i2c_adapter_by_node(parent_np);
of_node_put(parent_np);
if (!parent)
return ERR_PTR(-EPROBE_DEFER);
--
2.41.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3 3/3] i2c: muxes: i2c-mux-gpmux: Use of_get_i2c_adapter_by_node()
2023-10-20 15:30 ` [PATCH v3 3/3] i2c: muxes: i2c-mux-gpmux: " Herve Codina
@ 2023-10-21 17:58 ` Wolfram Sang
0 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2023-10-21 17:58 UTC (permalink / raw)
To: Herve Codina
Cc: Peter Rosin, Stephen Warren, Rob Herring, Greg Kroah-Hartman,
Jonathan Cameron, linux-i2c, linux-kernel, Allan Nielsen,
Horatiu Vultur, Steen Hegelund, Thomas Petazzoni, stable,
Jonathan Cameron
[-- Attachment #1: Type: text/plain, Size: 813 bytes --]
On Fri, Oct 20, 2023 at 05:30:13PM +0200, Herve Codina wrote:
> i2c-mux-gpmux uses the pair of_find_i2c_adapter_by_node() /
> i2c_put_adapter(). These pair alone is not correct to properly lock the
> I2C parent adapter.
>
> Indeed, i2c_put_adapter() decrements the module refcount while
> of_find_i2c_adapter_by_node() does not increment it. This leads to an
> underflow of the parent module refcount.
>
> Use the dedicated function, of_get_i2c_adapter_by_node(), to handle
> correctly the module refcount.
>
> Fixes: ac8498f0ce53 ("i2c: i2c-mux-gpmux: new driver")
> Signed-off-by: Herve Codina <herve.codina@bootlin.com>
> Cc: stable@vger.kernel.org
> Acked-by: Peter Rosin <peda@axentia.se>
> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Applied to for-current, thanks!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread