| Message ID | 20201103112323.1077040-1-yukuai3@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | [V2] fsl/fman: add missing put_devcie() call in fman_port_probe() | expand |
On Tue, 3 Nov 2020 19:23:23 +0800 Yu Kuai wrote: > --- a/drivers/net/ethernet/freescale/fman/fman_port.c > +++ b/drivers/net/ethernet/freescale/fman/fman_port.c > @@ -1792,20 +1792,21 @@ static int fman_port_probe(struct platform_device *of_dev) > if (!fm_node) { > dev_err(port->dev, "%s: of_get_parent() failed\n", __func__); > err = -ENODEV; > - goto return_err; > + goto free_port; > } > > + of_node_put(port_node); > fm_pdev = of_find_device_by_node(fm_node); > of_node_put(fm_node); > if (!fm_pdev) { > err = -EINVAL; > - goto return_err; > + goto free_port; > } This is not right either. I just asked you fix up the order of the error path, not move the of_node_put() in the body of the function. Now you're releasing the reference on the object and still use it after.
> -----Original Message----- > From: Jakub Kicinski <kuba@kernel.org> > Sent: 05 November 2020 03:31 > To: Yu Kuai <yukuai3@huawei.com> > Cc: Madalin Bucur <madalin.bucur@nxp.com>; davem@davemloft.net; Florinel > Iordache <florinel.iordache@nxp.com>; netdev@vger.kernel.org; linux- > kernel@vger.kernel.org; yi.zhang@huawei.com > Subject: Re: [PATCH V2] fsl/fman: add missing put_devcie() call in > fman_port_probe() > > On Tue, 3 Nov 2020 19:23:23 +0800 Yu Kuai wrote: > > --- a/drivers/net/ethernet/freescale/fman/fman_port.c > > +++ b/drivers/net/ethernet/freescale/fman/fman_port.c > > @@ -1792,20 +1792,21 @@ static int fman_port_probe(struct > platform_device *of_dev) > > if (!fm_node) { > > dev_err(port->dev, "%s: of_get_parent() failed\n", __func__); > > err = -ENODEV; > > - goto return_err; > > + goto free_port; > > } > > > > + of_node_put(port_node); > > fm_pdev = of_find_device_by_node(fm_node); > > of_node_put(fm_node); > > if (!fm_pdev) { > > err = -EINVAL; > > - goto return_err; > > + goto free_port; > > } > > This is not right either. I just asked you fix up the order of the > error path, not move the of_node_put() in the body of the function. > > Now you're releasing the reference on the object and still use it after. If you manage to put together a v3, please also address the typo in the subject (put_devcie). Madalin
On Sat, 7 Nov 2020 17:09:25 +0800 Yu Kuai wrote: > if of_find_device_by_node() succeed, fman_port_probe() doesn't have a > corresponding put_device(). Thus add jump target to fix the exception > handling for this function implementation. > > Fixes: 0572054617f3 ("fsl/fman: fix dereference null return value") > Signed-off-by: Yu Kuai <yukuai3@huawei.com> > @@ -1792,20 +1792,20 @@ static int fman_port_probe(struct platform_device *of_dev) > if (!fm_node) { > dev_err(port->dev, "%s: of_get_parent() failed\n", __func__); > err = -ENODEV; > - goto return_err; > + goto free_port; And now you no longer put port_node if jumping from here... Also does the reference to put_device() not have to be released when this function succeeds? > } > @@ -1896,7 +1895,9 @@ static int fman_port_probe(struct platform_device *of_dev) > > return 0; > > -return_err: > +put_device: > + put_device(&fm_pdev->dev); > +put_node: > of_node_put(port_node); > free_port: > kfree(port);
在 2020/11/08 6:09, Jakub Kicinski 写道: > On Sat, 7 Nov 2020 17:09:25 +0800 Yu Kuai wrote: >> if of_find_device_by_node() succeed, fman_port_probe() doesn't have a >> corresponding put_device(). Thus add jump target to fix the exception >> handling for this function implementation. >> >> Fixes: 0572054617f3 ("fsl/fman: fix dereference null return value") >> Signed-off-by: Yu Kuai <yukuai3@huawei.com> > >> @@ -1792,20 +1792,20 @@ static int fman_port_probe(struct platform_device *of_dev) >> if (!fm_node) { >> dev_err(port->dev, "%s: of_get_parent() failed\n", __func__); >> err = -ENODEV; >> - goto return_err; >> + goto free_port; > > And now you no longer put port_node if jumping from here... Sincerely apologize for that stupid mistake... > > Also does the reference to put_device() not have to be released when > this function succeeds? > I'm not sure about that, since fman_port_driver doesn't define other interface, maybe it reasonable to release it here. >> } > >> @@ -1896,7 +1895,9 @@ static int fman_port_probe(struct platform_device *of_dev) >> >> return 0; >> >> -return_err: >> +put_device: >> + put_device(&fm_pdev->dev); >> +put_node: >> of_node_put(port_node); >> free_port: >> kfree(port); > > . >
diff --git a/drivers/net/ethernet/freescale/fman/fman_port.c b/drivers/net/ethernet/freescale/fman/fman_port.c index d9baac0dbc7d..4ae5d844d1f5 100644 --- a/drivers/net/ethernet/freescale/fman/fman_port.c +++ b/drivers/net/ethernet/freescale/fman/fman_port.c @@ -1792,20 +1792,21 @@ static int fman_port_probe(struct platform_device *of_dev) if (!fm_node) { dev_err(port->dev, "%s: of_get_parent() failed\n", __func__); err = -ENODEV; - goto return_err; + goto free_port; } + of_node_put(port_node); fm_pdev = of_find_device_by_node(fm_node); of_node_put(fm_node); if (!fm_pdev) { err = -EINVAL; - goto return_err; + goto free_port; } fman = dev_get_drvdata(&fm_pdev->dev); if (!fman) { err = -EINVAL; - goto return_err; + goto put_device; } err = of_property_read_u32(port_node, "cell-index", &val); @@ -1813,7 +1814,7 @@ static int fman_port_probe(struct platform_device *of_dev) dev_err(port->dev, "%s: reading cell-index for %pOF failed\n", __func__, port_node); err = -EINVAL; - goto return_err; + goto put_device; } port_id = (u8)val; port->dts_params.id = port_id; @@ -1847,7 +1848,7 @@ static int fman_port_probe(struct platform_device *of_dev) } else { dev_err(port->dev, "%s: Illegal port type\n", __func__); err = -EINVAL; - goto return_err; + goto put_device; } port->dts_params.type = port_type; @@ -1861,7 +1862,7 @@ static int fman_port_probe(struct platform_device *of_dev) dev_err(port->dev, "%s: incorrect qman-channel-id\n", __func__); err = -EINVAL; - goto return_err; + goto put_device; } port->dts_params.qman_channel_id = qman_channel_id; } @@ -1871,20 +1872,18 @@ static int fman_port_probe(struct platform_device *of_dev) dev_err(port->dev, "%s: of_address_to_resource() failed\n", __func__); err = -ENOMEM; - goto return_err; + goto put_device; } port->dts_params.fman = fman; - of_node_put(port_node); - dev_res = __devm_request_region(port->dev, &res, res.start, resource_size(&res), "fman-port"); if (!dev_res) { dev_err(port->dev, "%s: __devm_request_region() failed\n", __func__); err = -EINVAL; - goto free_port; + goto put_device; } port->dts_params.base_addr = devm_ioremap(port->dev, res.start, @@ -1896,8 +1895,8 @@ static int fman_port_probe(struct platform_device *of_dev) return 0; -return_err: - of_node_put(port_node); +put_device: + put_device(&fm_pdev->dev); free_port: kfree(port); return err;
if of_find_device_by_node() succeed, fman_port_probe() doesn't have a corresponding put_device(). Thus add jump target to fix the exception handling for this function implementation. Fixes: 0572054617f3 ("fsl/fman: fix dereference null return value") Signed-off-by: Yu Kuai <yukuai3@huawei.com> --- .../net/ethernet/freescale/fman/fman_port.c | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-)