wifi: brcmfmac: release 'root' node in all execution paths

BugLink: https://bugs.launchpad.net/bugs/2101915

commit 2e19a3b590ebf2e351fc9d0e7c323430e65b6b6d upstream.

The fixed patch introduced an additional condition to enter the scope
where the 'root' device_node is released (!settings->board_type,
currently 'err'), which avoid decrementing the refcount with a call to
of_node_put() if that second condition is not satisfied.

Move the call to of_node_put() to the point where 'root' is no longer
required to avoid leaking the resource if err is not zero.

Cc: stable@vger.kernel.org
Fixes: 7682de8b33 ("wifi: brcmfmac: of: Fetch Apple properties")
Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://patch.msgid.link/20241030-brcmfmac-of-cleanup-v1-1-0b90eefb4279@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

This commit is contained in:

Javier Carrasco

2025-03-11 08:51:19 +09:00

committed by

Stefan Bader

parent 7af8c99342

commit 05ffd61c08

1 changed files with 1 additions and 2 deletions

									
										drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
									
		+1
		-2
	
												View File
												
				@@ -109,9 +109,8 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,

						}

						strreplace(board_type, '/', '-');

						settings->board_type = board_type;

						of_node_put(root);

					}

					of_node_put(root);

					if (!np || !of_device_is_compatible(np, "brcm,bcm4329-fmac"))

						return;