| Message ID | 20220512043828.496-1-linmq006@gmail.com |
|---|---|
| State | Accepted |
| Commit | bf4a9b2467b775717d0e9034ad916888e19713a3 |
| Headers | show |
| Series | ASoC: samsung: Fix refcount leak in aries_audio_probe | expand |
Acked-by: Jonathan Bakker <xc-racer2@live.ca> Thanks! Jonathan On 2022-05-11 9:38 p.m., Miaoqian Lin wrote: > of_parse_phandle() returns a node pointer with refcount > incremented, we should use of_node_put() on it when done. > If extcon_find_edev_by_node() fails, it doesn't call of_node_put() > Calling of_node_put() after extcon_find_edev_by_node() to fix this. > > Fixes: 7a3a7671fa6c ("ASoC: samsung: Add driver for Aries boards") > Signed-off-by: Miaoqian Lin <linmq006@gmail.com> > --- > sound/soc/samsung/aries_wm8994.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/soc/samsung/aries_wm8994.c b/sound/soc/samsung/aries_wm8994.c > index 5265e546b124..83acbe57b248 100644 > --- a/sound/soc/samsung/aries_wm8994.c > +++ b/sound/soc/samsung/aries_wm8994.c > @@ -585,10 +585,10 @@ static int aries_audio_probe(struct platform_device *pdev) > > extcon_np = of_parse_phandle(np, "extcon", 0); > priv->usb_extcon = extcon_find_edev_by_node(extcon_np); > + of_node_put(extcon_np); > if (IS_ERR(priv->usb_extcon)) > return dev_err_probe(dev, PTR_ERR(priv->usb_extcon), > "Failed to get extcon device"); > - of_node_put(extcon_np); > > priv->adc = devm_iio_channel_get(dev, "headset-detect"); > if (IS_ERR(priv->adc)) >
diff --git a/sound/soc/samsung/aries_wm8994.c b/sound/soc/samsung/aries_wm8994.c index 5265e546b124..83acbe57b248 100644 --- a/sound/soc/samsung/aries_wm8994.c +++ b/sound/soc/samsung/aries_wm8994.c @@ -585,10 +585,10 @@ static int aries_audio_probe(struct platform_device *pdev) extcon_np = of_parse_phandle(np, "extcon", 0); priv->usb_extcon = extcon_find_edev_by_node(extcon_np); + of_node_put(extcon_np); if (IS_ERR(priv->usb_extcon)) return dev_err_probe(dev, PTR_ERR(priv->usb_extcon), "Failed to get extcon device"); - of_node_put(extcon_np); priv->adc = devm_iio_channel_get(dev, "headset-detect"); if (IS_ERR(priv->adc))
of_parse_phandle() returns a node pointer with refcount incremented, we should use of_node_put() on it when done. If extcon_find_edev_by_node() fails, it doesn't call of_node_put() Calling of_node_put() after extcon_find_edev_by_node() to fix this. Fixes: 7a3a7671fa6c ("ASoC: samsung: Add driver for Aries boards") Signed-off-by: Miaoqian Lin <linmq006@gmail.com> --- sound/soc/samsung/aries_wm8994.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)