| Message ID | 20220308070238.19295-1-linmq006@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9747a78d5f758a5284751a10aee13c30d02bd5f1 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | ath10k: Fix error handling in ath10k_setup_msa_resources | expand |
On 3/7/2022 11:02 PM, Miaoqian Lin wrote: > The device_node pointer is returned by of_parse_phandle() with refcount Kalle, can you fix this nit when you apply? remove extra space after () > incremented. We should use of_node_put() on it when done. > > This function only calls of_node_put() in the regular path. > And it will cause refcount leak in error path. > > Fixes: 727fec790ead ("ath10k: Setup the msa resources before qmi init") > Signed-off-by: Miaoqian Lin <linmq006@gmail.com> > --- > drivers/net/wireless/ath/ath10k/snoc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c > index 9513ab696fff..f79dd9a71690 100644 > --- a/drivers/net/wireless/ath/ath10k/snoc.c > +++ b/drivers/net/wireless/ath/ath10k/snoc.c > @@ -1556,11 +1556,11 @@ static int ath10k_setup_msa_resources(struct ath10k *ar, u32 msa_size) > node = of_parse_phandle(dev->of_node, "memory-region", 0); > if (node) { > ret = of_address_to_resource(node, 0, &r); > + of_node_put(node); > if (ret) { > dev_err(dev, "failed to resolve msa fixed region\n"); > return ret; > } > - of_node_put(node); > > ar->msa.paddr = r.start; > ar->msa.mem_size = resource_size(&r); Reviewed-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Jeff Johnson <quic_jjohnson@quicinc.com> writes: > On 3/7/2022 11:02 PM, Miaoqian Lin wrote: >> The device_node pointer is returned by of_parse_phandle() with refcount > > Kalle, can you fix this nit when you apply? remove extra space after () Will do, thanks.
Miaoqian Lin <linmq006@gmail.com> wrote: > The device_node pointer is returned by of_parse_phandle() with refcount > incremented. We should use of_node_put() on it when done. > > This function only calls of_node_put() in the regular path. > And it will cause refcount leak in error path. > > Fixes: 727fec790ead ("ath10k: Setup the msa resources before qmi init") > Signed-off-by: Miaoqian Lin <linmq006@gmail.com> > Reviewed-by: Jeff Johnson <quic_jjohnson@quicinc.com> > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Patch applied to ath-next branch of ath.git, thanks. 9747a78d5f75 ath10k: Fix error handling in ath10k_setup_msa_resources
diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c index 9513ab696fff..f79dd9a71690 100644 --- a/drivers/net/wireless/ath/ath10k/snoc.c +++ b/drivers/net/wireless/ath/ath10k/snoc.c @@ -1556,11 +1556,11 @@ static int ath10k_setup_msa_resources(struct ath10k *ar, u32 msa_size) node = of_parse_phandle(dev->of_node, "memory-region", 0); if (node) { ret = of_address_to_resource(node, 0, &r); + of_node_put(node); if (ret) { dev_err(dev, "failed to resolve msa fixed region\n"); return ret; } - of_node_put(node); ar->msa.paddr = r.start; ar->msa.mem_size = resource_size(&r);
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done. This function only calls of_node_put() in the regular path. And it will cause refcount leak in error path. Fixes: 727fec790ead ("ath10k: Setup the msa resources before qmi init") Signed-off-by: Miaoqian Lin <linmq006@gmail.com> --- drivers/net/wireless/ath/ath10k/snoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)