Fix i2c mux module refcount issues
Subsystems (4)
v3 cover Fix i2c mux module refcount issues
Hi,
Some i2c mux drivers wrongly use the pair of_find_i2c_adapter_by_node() / i2c_put_adapter() to lock the 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 overflow over zero of the parent adapter user counter.
Identified mux drivers impacted are:
- i2c-mux-gpmux
- i2c-demux-pinctrl
- i2c-mux-pinctrl
Commit 48e9743dd648 ("i2c: core: add and export of_get_i2c_adapter_by_node() interface") introduces of_get_i2c_adapter_by_node() to correctly handle this refcount issue.
This series fixes the 3 identified mux drivers replacing the of_find_i2c_adapter_by_node() call by an of_get_i2c_adapter_by_node() call.
Compare to the previous iteration
https://lore.kernel.org/linux-kernel/[email protected]/
This v3 series:
- Fixes a wrong <tab> char in a commit log message
- Add 'Cc: [email protected]'
- Add Reviewed-by tags
Best regards,
Hervé
Changes v2 -> v3
- Patch 2
Replace a wrong <tab> char by a <space> char in commit message
- All patches
Add 'Cc: [email protected]'
Add 'Reviewed-by: Jonathan Cameron <[email protected]>'
Changes v1 -> v2:
- All patches
Fix commit log
Add relevant Fixes tag
Add 'Acked-by: Peter Rosin <[email protected]>'
Herve Codina (3):
i2c: muxes: i2c-mux-pinctrl: Use of_get_i2c_adapter_by_node()
i2c: muxes: i2c-demux-pinctrl: Use of_get_i2c_adapter_by_node()
i2c: muxes: i2c-mux-gpmux: Use of_get_i2c_adapter_by_node()
drivers/i2c/muxes/i2c-demux-pinctrl.c | 2 +- drivers/i2c/muxes/i2c-mux-gpmux.c | 2 +- drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
2.41.0
PATCH v3 1/3 i2c: muxes: i2c-mux-pinctrl: Use of_get_i2c_adapter_by_node()
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.
--- drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/muxes/i2c-mux-pinctrl.c +1 -1
@@ -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 );
Signature · 1 line
2.41.0
Re: [PATCH v3 1/3] i2c: muxes: i2c-mux-pinctrl: Use of_get_i2c_adapter_by_node()
Quoted 8 lines · Herve Codina
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 whileof_find_i2c_adapter_by_node()does not increment it. This leads to an underflow of the parent module refcount.
Quoted 8 lines
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 <[email protected]>Acked-by Peter Rosin <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>
Applied to for-current, thanks!
PATCH v3 2/3 i2c: muxes: i2c-demux-pinctrl: Use of_get_i2c_adapter_by_node()
In reply to Herve Codinai2c-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.
--- drivers/i2c/muxes/i2c-demux-pinctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/muxes/i2c-demux-pinctrl.c +1 -1
@@ -61,7 +61,7 @@ static int i2c_demux_activate_master(struct i2c_demux_pinctrl_priv *priv, u32 neif (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;
Signature · 1 line
2.41.0
Re: [PATCH v3 2/3] i2c: muxes: i2c-demux-pinctrl: Use of_get_i2c_adapter_by_node()
Quoted 8 lines · Herve Codina
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 whileof_find_i2c_adapter_by_node()does not increment it. This leads to an underflow of the parent module refcount.
Quoted 8 lines
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 <[email protected]>Acked-by Peter Rosin <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>
Applied to for-current, thanks!
PATCH v3 3/3 i2c: muxes: i2c-mux-gpmux: Use of_get_i2c_adapter_by_node()
In reply to Herve Codinai2c-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.
--- drivers/i2c/muxes/i2c-mux-gpmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/muxes/i2c-mux-gpmux.c +1 -1
@@ -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 );
Signature · 1 line
2.41.0
Re: [PATCH v3 3/3] i2c: muxes: i2c-mux-gpmux: Use of_get_i2c_adapter_by_node()
Quoted 8 lines · Herve Codina
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 whileof_find_i2c_adapter_by_node()does not increment it. This leads to an underflow of the parent module refcount.
Quoted 8 lines
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 <[email protected]>Acked-by Peter Rosin <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>
Applied to for-current, thanks!