Commit e42eec0f authored by Javier Carrasco's avatar Javier Carrasco Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: btbcm: fix missing of_node_put() in btbcm_get_board_name() 



of_find_node_by_path() returns a pointer to a device_node with its
refcount incremented, and a call to of_node_put() is required to
decrement the refcount again and avoid leaking the resource.

If 'of_property_read_string_index(root, "compatible", 0, &tmp)' fails,
the function returns without calling of_node_put(root) before doing so.

The automatic cleanup attribute can be used by means of the __free()
macro to automatically call of_node_put() when the variable goes out of
scope, fixing the issue and also accounting for new error paths.

Fixes: 63fac334 ("Bluetooth: btbcm: Support per-board firmware variants")
Signed-off-by: default avatarJavier Carrasco <javier.carrasco.cruz@gmail.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent faa5fd60

drivers/bluetooth/btbcm.c

+1 −3
Original line number Diff line number Diff line
@@ -541,11 +541,10 @@ static const struct bcm_subver_table bcm_usb_subver_table[] = { 
static const char *btbcm_get_board_name(struct device *dev)

{

#ifdef CONFIG_OF

	struct device_node *root;

	struct device_node *root __free(device_node) = of_find_node_by_path("/");

	char *board_type;

	const char *tmp;



	root = of_find_node_by_path("/");

	if (!root)

		return NULL;
@@ -555,7 +554,6 @@ static const char *btbcm_get_board_name(struct device *dev) 
	/* get rid of any '/' in the compatible string */

	board_type = devm_kstrdup(dev, tmp, GFP_KERNEL);

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

	of_node_put(root);



	return board_type;

#else