From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Crispin Subject: [PATCH] pinctrl: fix signed vs unsigned conditional inside pinmux_map_to_setting Date: Mon, 23 Apr 2012 10:12:23 +0200 Message-ID: <1335168743-3868-1-git-send-email-blogic@openwrt.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Sender: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org To: Linus Walleij Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, Dong Aisheng List-Id: devicetree@vger.kernel.org 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 Cc: Stephen Warren Cc: Dong Aisheng --- 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