diff options
author | Haowen Bai <baihaowen@meizu.com> | 2022-04-21 04:26:59 +0200 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2022-06-15 15:19:57 +0200 |
commit | 84a85d3fef2e75b1fe9fc2af6f5267122555a1ed (patch) | |
tree | d7dcfdddda38fe4c3e566772ec9fd6082d4e651e /drivers/pinctrl/aspeed | |
parent | Linux 5.19-rc1 (diff) | |
download | linux-84a85d3fef2e75b1fe9fc2af6f5267122555a1ed.tar.xz linux-84a85d3fef2e75b1fe9fc2af6f5267122555a1ed.zip |
pinctrl: aspeed: Fix potential NULL dereference in aspeed_pinmux_set_mux()
pdesc could be null but still dereference pdesc->name and it will lead to
a null pointer access. So we move a null check before dereference.
Signed-off-by: Haowen Bai <baihaowen@meizu.com>
Link: https://lore.kernel.org/r/1650508019-22554-1-git-send-email-baihaowen@meizu.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/aspeed')
-rw-r--r-- | drivers/pinctrl/aspeed/pinctrl-aspeed.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.c b/drivers/pinctrl/aspeed/pinctrl-aspeed.c index c94e24aadf92..83d47ff1cea8 100644 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed.c +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.c @@ -236,11 +236,11 @@ int aspeed_pinmux_set_mux(struct pinctrl_dev *pctldev, unsigned int function, const struct aspeed_sig_expr **funcs; const struct aspeed_sig_expr ***prios; - pr_debug("Muxing pin %s for %s\n", pdesc->name, pfunc->name); - if (!pdesc) return -EINVAL; + pr_debug("Muxing pin %s for %s\n", pdesc->name, pfunc->name); + prios = pdesc->prios; if (!prios) |