[PATCH] pinctrl: fix signed vs unsigned conditional inside pinmux_map_to_setting

[PATCH] pinctrl: fix signed vs unsigned conditional inside pinmux_map_to_setting

[John Crispin]

pinmux_map_to_settingi() uses setting->data.mux.func to store the return code of
pinmux_func_name_to_selector(). However, struct pinctrl_setting_mux defines the
func element as unsigned, resulting in all error codes getting lost. The
conditional following the assignment will always evaluate to false thus breaking
the error path.

This bug can be triggered by loading a pinmux group map from the devicetree
with an invalid function string.

Signed-off-by: John Crispin <blogic-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>
Cc: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Cc: Dong Aisheng <dong.aisheng-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

---
 drivers/pinctrl/pinmux.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index c494c37..cd377a2 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -328,10 +328,10 @@ int pinmux_map_to_setting(struct pinctrl_map const *map,
 		return -EINVAL;
 	}
 
-	setting->data.mux.func =
-		pinmux_func_name_to_selector(pctldev, map->data.mux.function);
-	if (setting->data.mux.func < 0)
-		return setting->data.mux.func;
+	ret = pinmux_func_name_to_selector(pctldev, map->data.mux.function);
+	if (ret < 0)
+		return ret;
+	setting->data.mux.func = ret;
 
 	ret = pmxops->get_function_groups(pctldev, setting->data.mux.func,
 					  &groups, &num_groups);
-- 
1.7.9.1

Re: [PATCH] pinctrl: fix signed vs unsigned conditional inside pinmux_map_to_setting

[Stephen Warren]

On 04/23/2012 02:12 AM, John Crispin wrote:
> pinmux_map_to_settingi() uses setting->data.mux.func to store the return code of
> pinmux_func_name_to_selector(). However, struct pinctrl_setting_mux defines the
> func element as unsigned, resulting in all error codes getting lost. The
> conditional following the assignment will always evaluate to false thus breaking
> the error path.

This makes sense.

The exact same issue applies to the assignment to
setting->data.mux.group just a little below. Can you fix that up too please?

Re: [PATCH] pinctrl: fix signed vs unsigned conditional inside pinmux_map_to_setting

[John Crispin]

On 23/04/12 17:52, Stephen Warren wrote:
> On 04/23/2012 02:12 AM, John Crispin wrote:
>> pinmux_map_to_settingi() uses setting->data.mux.func to store the return code of
>> pinmux_func_name_to_selector(). However, struct pinctrl_setting_mux defines the
>> func element as unsigned, resulting in all error codes getting lost. The
>> conditional following the assignment will always evaluate to false thus breaking
>> the error path.
> This makes sense.
>
> The exact same issue applies to the assignment to
> setting->data.mux.group just a little below. Can you fix that up too please?
>

missed the group thing, patch coming up ....