Skip to contentSkip to conversation

pinctrl: aspeed: fix null dereference in debug

PATCH Superseded Weiguo Li 3 participants 5 messages Mar 1, 2022 – Mar 4, 2022

Subsystems (4)
lore
Share & tools
lore

Weiguo Li

author
#0 lore raw

PATCH 1/1 pinctrl: aspeed: fix null dereference in debug

"pdesc" is null checked, but already dereferenced ahead in debug. Swap their positions to avoid potential null dereference.

---
 drivers/pinctrl/aspeed/pinctrl-aspeed.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/aspeed/pinctrl-aspeed.c +2 -2
index c94e24aadf92..83d47ff1cea8 100644
@@ -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)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 pinctrl: aspeed: fix null dereference in debug

Quoted 4 lines · Weiguo Li

"pdesc" is null checked, but already dereferenced ahead in debug. Swap their positions to avoid potential null dereference.

Thanks.

Quoted 26 lines
---
 drivers/pinctrl/aspeed/pinctrl-aspeed.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/aspeed/pinctrl-aspeed.c +2 -2
index c94e24aadf92..83d47ff1cea8 100644
@@ -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)

Signature · 1 line
2.25.1
author
#2 lore raw

PATCH v2 1/1 pinctrl: aspeed: fix null dereference in debug

"pdesc" is null checked, but already dereferenced ahead in debug. Swap their positions to avoid potential null dereference.

---
v2:
* resend it after registering an account in aspeed patchwork

---
 drivers/pinctrl/aspeed/pinctrl-aspeed.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/aspeed/pinctrl-aspeed.c +2 -2
index c94e24aadf92..83d47ff1cea8 100644
@@ -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)
Signature · 1 line
2.25.1
author
#3 lore raw

PATCH v2 1/1 pinctrl: aspeed: fix null dereference in debug

Quoted 21 lines · On Wed, 02 Mar 2022 15:12:24 Weiguo Li wrote:

"pdesc" is null checked, but already dereferenced ahead in debug. Swap their positions to avoid potential null dereference.

---
v2:
* resend it after registering an account in aspeed patchwork

---
 drivers/pinctrl/aspeed/pinctrl-aspeed.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/aspeed/pinctrl-aspeed.c +0 -0
index c94e24aadf92..83d47ff1cea8 100644
@@ -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;
 

drivers/pinctrl/aspeed/pinctrl-aspeed.c int aspeed_pinmux_set_mux(struct pinctrl_dev *pctldev, unsigned int function, · line 246

Quoted 10 lines
drivers/pinctrl/aspeed/pinctrl-aspeed.c +2 -2
- 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)

Moving Petr's review from previous version:

-Weiguo