pinctrl: freescale: Fix a memory out of bounds when num_configs is 1
authorXiaolei Wang <xiaolei.wang@windriver.com>
Thu, 4 May 2023 23:37:36 +0000 (07:37 +0800)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 16 Jun 2023 12:59:03 +0000 (14:59 +0200)
The config passed in by pad wakeup is 1, when num_configs is 1,
Configuration [1] should not be fetched, which will be detected
by KASAN as a memory out of bounds condition. Modify to get
configs[1] when num_configs is 2.

Fixes: f60c9eac54af ("gpio: mxc: enable pad wakeup on i.MX8x platforms")
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/20230504233736.3766296-1-xiaolei.wang@windriver.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/freescale/pinctrl-scu.c

index ea261b6e74581fc8e406a8e9452c437baa302f95..3b252d684d723af99ed5deb54a198b9b64457f57 100644 (file)
@@ -90,7 +90,7 @@ int imx_pinconf_set_scu(struct pinctrl_dev *pctldev, unsigned pin_id,
        struct imx_sc_msg_req_pad_set msg;
        struct imx_sc_rpc_msg *hdr = &msg.hdr;
        unsigned int mux = configs[0];
-       unsigned int conf = configs[1];
+       unsigned int conf;
        unsigned int val;
        int ret;
 
@@ -115,6 +115,7 @@ int imx_pinconf_set_scu(struct pinctrl_dev *pctldev, unsigned pin_id,
         * Set mux and conf together in one IPC call
         */
        WARN_ON(num_configs != 2);
+       conf = configs[1];
 
        val = conf | BM_PAD_CTL_IFMUX_ENABLE | BM_PAD_CTL_GP_ENABLE;
        val |= mux << BP_PAD_CTL_IFMUX;