2015-06-08 15:16:50

by Ludovic Desroches

Subject: [PATCH] pinctrl: don't try to print function groups if we can't get them

There is no reason to try to print groups associated to a function if
get_function_groups returns an error. Moreover, it can lead to a NULL
pointer dereference error.

Signed-off-by: Ludovic Desroches <[email protected]>
---
drivers/pinctrl/pinmux.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index b874458..fd944e3 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -544,9 +544,12 @@ static int pinmux_functions_show(struct seq_file *s, void *what)

ret = pmxops->get_function_groups(pctldev, func_selector,
&groups, &num_groups);
- if (ret)
+ if (ret) {
seq_printf(s, "function %s: COULD NOT GET GROUPS\n",
func);
+ func_selector++;
+ continue;
+ }

seq_printf(s, "function: %s, groups = [ ", func);
for (i = 0; i < num_groups; i++)
--
2.2.0

2015-06-10 08:44:57

by Linus Walleij

Subject: Re: [PATCH] pinctrl: don't try to print function groups if we can't get them

On Mon, Jun 8, 2015 at 5:16 PM, Ludovic Desroches
<[email protected]> wrote:

> There is no reason to try to print groups associated to a function if
> get_function_groups returns an error. Moreover, it can lead to a NULL
> pointer dereference error.
>
> Signed-off-by: Ludovic Desroches <[email protected]>

Patch applied.

Yours,
Linus Walleij