summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMa Ke <make24@iscas.ac.cn>2024-08-08 12:13:55 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-09-04 13:15:02 +0200
commit2cea369a5c2e85ab14ae716da1d1cc6d25c85e11 (patch)
tree11b5fc09a1ca03b608fbb54de033567b89f060ba
parent3b505759447637dcccb50cbd98ec6f8d2a04fc46 (diff)
downloadlinux-2cea369a5c2e85ab14ae716da1d1cc6d25c85e11.tar.gz
linux-2cea369a5c2e85ab14ae716da1d1cc6d25c85e11.tar.bz2
linux-2cea369a5c2e85ab14ae716da1d1cc6d25c85e11.zip
pinctrl: single: fix potential NULL dereference in pcs_get_function()
commit 1c38a62f15e595346a1106025722869e87ffe044 upstream. 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: 571aec4df5b7 ("pinctrl: single: Use generic pinmux helpers for managing functions") Signed-off-by: Ma Ke <make24@iscas.ac.cn> Link: https://lore.kernel.org/20240808041355.2766009-1-make24@iscas.ac.cn Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/pinctrl/pinctrl-single.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 13517243355c..43b25119efa2 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -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",