| Message ID | 20220428014514.2509940-1-yangyingliang@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: cpsw: add missing of_node_put() in cpsw_probe_dt() | expand |
On Thu, 28 Apr 2022 09:45:14 +0800 Yang Yingliang wrote: > If devm_kcalloc() fails, 'tmp_node' should be put in cpsw_probe_dt(). > > Fixes: ed3525eda4c4 ("net: ethernet: ti: introduce cpsw switchdev based driver part 1 - dual-emac") > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Why does the error path (the err_node_put label) not put the tmp_node reference either? > diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/cpsw_new.c > index bd4b1528cf99..b81179f7d738 100644 > --- a/drivers/net/ethernet/ti/cpsw_new.c > +++ b/drivers/net/ethernet/ti/cpsw_new.c > @@ -1246,8 +1246,10 @@ static int cpsw_probe_dt(struct cpsw_common *cpsw) > data->slave_data = devm_kcalloc(dev, CPSW_SLAVE_PORTS_NUM, > sizeof(struct cpsw_slave_data), > GFP_KERNEL); > - if (!data->slave_data) > + if (!data->slave_data) { > + of_node_put(tmp_node); > return -ENOMEM; > + } > > /* Populate all the child nodes here... > */
diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/cpsw_new.c index bd4b1528cf99..b81179f7d738 100644 --- a/drivers/net/ethernet/ti/cpsw_new.c +++ b/drivers/net/ethernet/ti/cpsw_new.c @@ -1246,8 +1246,10 @@ static int cpsw_probe_dt(struct cpsw_common *cpsw) data->slave_data = devm_kcalloc(dev, CPSW_SLAVE_PORTS_NUM, sizeof(struct cpsw_slave_data), GFP_KERNEL); - if (!data->slave_data) + if (!data->slave_data) { + of_node_put(tmp_node); return -ENOMEM; + } /* Populate all the child nodes here... */
If devm_kcalloc() fails, 'tmp_node' should be put in cpsw_probe_dt(). Fixes: ed3525eda4c4 ("net: ethernet: ti: introduce cpsw switchdev based driver part 1 - dual-emac") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- drivers/net/ethernet/ti/cpsw_new.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)