Messages in this thread | | | Date | Tue, 12 Dec 2023 18:53:13 +0100 | Subject | Re: [PATCH] cdx: Unlock on error path in rescan_store() | From | Christophe JAILLET <> |
| |
Le 12/12/2023 à 10:20, Dan Carpenter a écrit : > We added locking to this function but these two error paths were > accidentally overlooked. > > Fixes: f0af81683466 ("cdx: Introduce lock to protect controller ops") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > --- > drivers/cdx/cdx.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c > index d84d153078d7..f4f9f0c88c09 100644 > --- a/drivers/cdx/cdx.c > +++ b/drivers/cdx/cdx.c > @@ -572,12 +572,16 @@ static ssize_t rescan_store(const struct bus_type *bus, > > /* Rescan all the devices */ > for_each_compatible_node(np, NULL, compat_node_name) { > - if (!np) > - return -EINVAL; > + if (!np) { > + count = -EINVAL; > + goto unlock; > + } > > pd = of_find_device_by_node(np); > - if (!pd) > - return -EINVAL; > + if (!pd) { > + count = -EINVAL; > + goto unlock;
Unrelated to your patch, but should we have a of_node_put(np); here, on early exit?
CJ
> + } > > cdx = platform_get_drvdata(pd); > if (cdx && cdx->controller_registered && cdx->ops->scan) > @@ -585,7 +589,7 @@ static ssize_t rescan_store(const struct bus_type *bus, > > put_device(&pd->dev); > } > - > +unlock: > mutex_unlock(&cdx_controller_lock); > > return count;
| |