[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230504233736.3766296-1-xiaolei.wang@windriver.com>
Date: Fri, 5 May 2023 07:37:36 +0800
From: Xiaolei Wang <xiaolei.wang@...driver.com>
To: aisheng.dong@....com, festevam@...il.com, shawnguo@...nel.org,
ping.bai@....com, kernel@...gutronix.de, linus.walleij@...aro.org,
peng.fan@....com, shenwei.wang@....com,
bartosz.golaszewski@...aro.org
Cc: linux-gpio@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [v4][PATCH] pinctrl: freescale: Fix a memory out of bounds when num_configs is 1
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@...driver.com>
---
Changes since v3:
- update commit log, delete call trace
drivers/pinctrl/freescale/pinctrl-scu.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/pinctrl/freescale/pinctrl-scu.c b/drivers/pinctrl/freescale/pinctrl-scu.c
index ea261b6e7458..3b252d684d72 100644
--- a/drivers/pinctrl/freescale/pinctrl-scu.c
+++ b/drivers/pinctrl/freescale/pinctrl-scu.c
@@ -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;
--
2.25.1
Powered by blists - more mailing lists