Commit 83e1bcaf authored by Gaosheng Cui's avatar Gaosheng Cui Committed by Linus Walleij
Browse files

pinctrl: thunderbay: fix possible memory leak in thunderbay_build_functions() 



The thunderbay_add_functions() will free memory of thunderbay_funcs
when everything is ok, but thunderbay_funcs will not be freed when
thunderbay_add_functions() fails, then there will be a memory leak,
so we need to add kfree() when thunderbay_add_functions() fails to
fix it.

In addition, doing some cleaner works, moving kfree(funcs) from
thunderbay_add_functions() to thunderbay_build_functions().

Fixes: 12422af8 ("pinctrl: Add Intel Thunder Bay pinctrl driver")
Signed-off-by: default avatarGaosheng Cui <cuigaosheng1@huawei.com>
Reviewed-by: default avatarRafał Miłecki <rafal@milecki.pl>
Link: https://lore.kernel.org/r/20221129120126.1567338-1-cuigaosheng1@huawei.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 80b99ed7

drivers/pinctrl/pinctrl-thunderbay.c

+6 −2
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ static int thunderbay_add_functions(struct thunderbay_pinctrl *tpc, struct funct 
					    funcs[i].num_group_names,

					    funcs[i].data);

	}

	kfree(funcs);



	return 0;

}
@@ -817,6 +817,7 @@ static int thunderbay_build_functions(struct thunderbay_pinctrl *tpc) 
	struct function_desc *thunderbay_funcs;

	void *ptr;

	int pin;

	int ret;



	/*

	 * Allocate maximum possible number of functions. Assume every pin
@@ -860,7 +861,10 @@ static int thunderbay_build_functions(struct thunderbay_pinctrl *tpc) 
		return -ENOMEM;



	thunderbay_funcs = ptr;

	return thunderbay_add_functions(tpc, thunderbay_funcs);

	ret = thunderbay_add_functions(tpc, thunderbay_funcs);



	kfree(thunderbay_funcs);

	return ret;

}



static int thunderbay_pinconf_set_tristate(struct thunderbay_pinctrl *tpc,