summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2011-11-08 04:31:47 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-11-09 22:14:13 +0100
commit1eb54c8a0fa0061247f3bd327b320c3e20c97340 (patch)
tree497dd62c738b42682bce13cf8e2931a0f2aebcdc /drivers/net/wireless/mwifiex
parentmwifiex: enable SDIO multiport aggregation (diff)
downloadlinux-1eb54c8a0fa0061247f3bd327b320c3e20c97340.tar.xz
linux-1eb54c8a0fa0061247f3bd327b320c3e20c97340.zip
mwifiex: prevent corruption instead of just warning
Probably we never hit this condition, but in case we do, we may as well put a return here instead of just printing a warning message and then corrupting memory. The caller doesn't check the return code. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex')
-rw-r--r--drivers/net/wireless/mwifiex/pcie.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
index d12d44055489..a2f32008f9a8 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -1228,9 +1228,12 @@ static int mwifiex_pcie_event_complete(struct mwifiex_adapter *adapter,
if (!skb)
return 0;
- if (rdptr >= MWIFIEX_MAX_EVT_BD)
+ if (rdptr >= MWIFIEX_MAX_EVT_BD) {
dev_err(adapter->dev, "event_complete: Invalid rdptr 0x%x\n",
rdptr);
+ ret = -EINVAL;
+ goto done;
+ }
/* Read the event ring write pointer set by firmware */
if (mwifiex_read_reg(adapter, REG_EVTBD_WRPTR, &wrptr)) {