diff mbox series

ath10k: Fix error handling in ath10k_setup_msa_resources

Message ID 20220308070238.19295-1-linmq006@gmail.com
State New
Headers show
Series ath10k: Fix error handling in ath10k_setup_msa_resources | expand

Commit Message

Miaoqian Lin March 8, 2022, 7:02 a.m. UTC
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(-)

Comments

Jeff Johnson March 9, 2022, 12:05 a.m. UTC | #1
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>
Kalle Valo March 9, 2022, 7:23 a.m. UTC | #2
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.
Kalle Valo March 10, 2022, 3:52 p.m. UTC | #3
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 mbox series

Patch

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);