iio: adc: meson_saradc: Fix memory allocation order
Subsystems (2)
PATCH 1/1 iio: adc: meson_saradc: Fix memory allocation order
meson_saradc's irq handler uses priv->regmap so make sure that it is allocated before the irq get enabled.
This also fixes crash when CONFIG_DEBUG_SHIRQ is enabled, as device managed resources are freed in the inverted order they had been allocated, priv->regmap was freed before the spurious fake irq that CONFIG_DEBUG_SHIRQ adds called the handler.
--- drivers/iio/adc/meson_saradc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/iio/adc/meson_saradc.c +5 -5
@@ -1219,6 +1219,11 @@ static int meson_sar_adc_probe(struct platform_device *pdev)if (IS_ERR (base))return PTR_ERR (base); + priv->regmap =devm_regmap_init_mmio (&pdev->dev, base, + priv->param->regmap_config); +if (IS_ERR (priv->regmap)) +return PTR_ERR (priv->regmap); + irq =irq_of_parse_and_map (pdev->dev.of_node,0 );if (!irq)return -EINVAL ;
@@ -1228,11 +1233,6 @@ static int meson_sar_adc_probe(struct platform_device *pdev)if (ret)return ret; - priv->regmap =devm_regmap_init_mmio (&pdev->dev, base, - priv->param->regmap_config); -if (IS_ERR (priv->regmap)) -return PTR_ERR (priv->regmap); - priv->clkin =devm_clk_get (&pdev->dev,"clkin" );if (IS_ERR (priv->clkin)) {dev_err (&pdev->dev,"failed to get clkin\n" );
Signature · 1 line
2.20.1
Quoted 9 lines · Remi Pommarel
meson_saradc's irq handler uses
priv->regmapso make sure that it is allocated before the irq get enabled.This also fixes crash when
CONFIG_DEBUG_SHIRQis enabled, as device managed resources are freed in the inverted order they had been allocated,priv->regmapwas freed before the spurious fake irq thatCONFIG_DEBUG_SHIRQadds called the handler.
interrupt mode")
Quoted 2 lines
Reported-by Elie Roudninski <[email protected]>Signed-off-by Remi Pommarel <[email protected]>
thank you for fixing this!
Martin
Elie Roudninski
Tested-byQuoted 12 lines · Martin Blumenstingl
Quoted 9 lines · Remi Pommarel
meson_saradc's irq handler uses
priv->regmapso make sure that it is allocated before the irq get enabled.This also fixes crash when
CONFIG_DEBUG_SHIRQis enabled, as device managed resources are freed in the inverted order they had been allocated,priv->regmapwas freed before the spurious fake irq thatCONFIG_DEBUG_SHIRQadds called the handler.
Quoted 7 lines
Fixes 3af109131b7eb8 ("iio: adc: meson-saradc: switch from polling tointerrupt mode")
Quoted 2 lines
Reported-by Elie Roudninski <[email protected]>Signed-off-by Remi Pommarel <[email protected]>Reviewed-by Martin Blumenstingl <[email protected]>thank you for fixing this!
The patch fixed the kernel panic I had, i can now successfully boot my meson-gxl-s905x-libretech-cc boad using patched linux 5.2.11
Elie
Quoted 3 lines
Martin
Quoted 18 lines · On Mon, 2 Sep 2019 21:40:49 +0100 Elie Roudninski <[email protected]> wrote:
Quoted 16 lines · Martin Blumenstingl
Quoted 9 lines · Remi Pommarel
meson_saradc's irq handler uses
priv->regmapso make sure that it is allocated before the irq get enabled.This also fixes crash when
CONFIG_DEBUG_SHIRQis enabled, as device managed resources are freed in the inverted order they had been allocated,priv->regmapwas freed before the spurious fake irq thatCONFIG_DEBUG_SHIRQadds called the handler.Fixes 3af109131b7eb8 ("iio: adc: meson-saradc: switch from polling tointerrupt mode")
Quoted 2 lines
Reported-by Elie Roudninski <[email protected]>Signed-off-by Remi Pommarel <[email protected]>
Quoted 7 lines
Quoted 3 lines
Reviewed-by Martin Blumenstingl <[email protected]>thank you for fixing this!
The patch fixed the kernel panic I had, i can now successfully boot my meson-gxl-s905x-libretech-cc boad using patched linux 5.2.11
Tested-by Elie ROUDNINSKI <[email protected]>
Rather than rush through a quick pull request I'm going to hold this one until after the merge window.
Applied to the fixes-togreg branch of iio.git (which is now based on staging-next).
Thanks,
Jonathan
Quoted 5 lines
Elie
Quoted 3 lines
Martin
Quoted 10 lines · Remi Pommarel
meson_saradc's irq handler uses
priv->regmapso make sure that it is allocated before the irq get enabled.This also fixes crash when
CONFIG_DEBUG_SHIRQis enabled, as device managed resources are freed in the inverted order they had been allocated,priv->regmapwas freed before the spurious fake irq thatCONFIG_DEBUG_SHIRQadds called the handler.Reported-by Elie Roudninski <[email protected]>Signed-off-by Remi Pommarel <[email protected]>