Commit 9a8aadb7 authored by Ma Ke's avatar Ma Ke Committed by Zhang Zekun
Browse files

pinctrl: single: fix potential NULL dereference in pcs_get_function() 

mainline inclusion
from mainline-v6.11-rc6
commit 1c38a62f15e595346a1106025722869e87ffe044
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAR49K
CVE: CVE-2024-46685

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1c38a62f15e595346a1106025722869e87ffe044



-------------------------------------------------------

pinmux_generic_get_function() can return NULL and the pointer 'function'
was dereferenced without checking against NULL. Add checking of pointer
'function' in pcs_get_function().

Found by code review.

Cc: stable@vger.kernel.org
Fixes: 571aec4d ("pinctrl: single: Use generic pinmux helpers for managing functions")
Signed-off-by: default avatarMa Ke <make24@iscas.ac.cn>
Link: https://lore.kernel.org/20240808041355.2766009-1-make24@iscas.ac.cn


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarZhang Zekun <zhangzekun11@huawei.com>
parent 858328aa

drivers/pinctrl/pinctrl-single.c

+2 −0
Original line number Diff line number Diff line
@@ -323,6 +323,8 @@ static int pcs_get_function(struct pinctrl_dev *pctldev, unsigned pin, 
		return -ENOTSUPP;

	fselector = setting->func;

	function = pinmux_generic_get_function(pctldev, fselector);

	if (!function)

		return -EINVAL;

	*func = function->data;

	if (!(*func)) {

		dev_err(pcs->dev, "%s could not find function%i\n",