[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250517154611.910-1-vulab@iscas.ac.cn>
Date: Sat, 17 May 2025 23:46:11 +0800
From: Wentao Liang <vulab@...as.ac.cn>
To: ajay.kathat@...rochip.com,
claudiu.beznea@...on.dev,
kvalo@...nel.org
Cc: linux-wireless@...r.kernel.org,
linux-kernel@...r.kernel.org,
Wentao Liang <vulab@...as.ac.cn>,
stable@...r.kernel.org
Subject: [PATCH] wifi: wilc1000: Handle wilc_sdio_cmd52() failure in wilc_sdio_read_init()
The wilc_sdio_read_init() calls wilc_sdio_cmd52() but does not check the
return value. This could lead to execution with potentially invalid data
if wilc_sdio_cmd52() fails. A proper implementation can be found in
wilc_sdio_read_reg().
Add error handling for wilc_sdio_cmd52(). If wilc_sdio_cmd52() fails,
log an error message via dev_err().
Fixes: eda308be643f ("staging: wilc1000: refactor interrupt handling for sdio")
Cc: stable@...r.kernel.org # v5.7
Signed-off-by: Wentao Liang <vulab@...as.ac.cn>
---
drivers/net/wireless/microchip/wilc1000/sdio.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
index e7a2bc9f9902..d0e8b812b622 100644
--- a/drivers/net/wireless/microchip/wilc1000/sdio.c
+++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
@@ -809,6 +809,7 @@ static int wilc_sdio_read_int(struct wilc *wilc, u32 *int_status)
u32 tmp;
u8 irq_flags;
struct sdio_cmd52 cmd;
+ int ret;
wilc_sdio_read_size(wilc, &tmp);
@@ -827,7 +828,12 @@ static int wilc_sdio_read_int(struct wilc *wilc, u32 *int_status)
cmd.raw = 0;
cmd.read_write = 0;
cmd.data = 0;
- wilc_sdio_cmd52(wilc, &cmd);
+ ret = wilc_sdio_cmd52(wilc, &cmd);
+ if (ret) {
+ dev_err(&func->devm, "Fail cmd 52, get IRQ register...\n");
+ return ret;
+ }
+
irq_flags = cmd.data;
if (sdio_priv->irq_gpio)
--
2.42.0.windows.2
Powered by blists - more mailing lists