Patchwork cxgb4: allocate enough data in t4_memory_rw()

login
register
mail settings
Submitter Dan Carpenter
Date Oct. 8, 2012, 7:12 a.m.
Message ID <20121008071210.GA17400@elgon.mountain>
Download mbox | patch
Permalink /patch/189922/
State Accepted
Delegated to: David Miller
Headers show

Comments

Dan Carpenter - Oct. 8, 2012, 7:12 a.m.
MEMWIN0_APERTURE is the size in bytes.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
This was introduced in 8c357ebd569 "cxgb4: Dynamically allocate memory
in t4_memory_rw() and get_vpd_params()" from Oct 3.

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Oct. 8, 2012, 7:13 a.m.
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 8 Oct 2012 10:12:11 +0300

> MEMWIN0_APERTURE is the size in bytes.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Applied, thanks Dan.

> ---
> This was introduced in 8c357ebd569 "cxgb4: Dynamically allocate memory
> in t4_memory_rw() and get_vpd_params()" from Oct 3.

Sigh, putting bad on top of bad...
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index 137a244..e914c41 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -417,7 +417,7 @@  static int t4_memory_rw(struct adapter *adap, int mtype, u32 addr, u32 len,
 	if ((addr & 0x3) || (len & 0x3))
 		return -EINVAL;
 
-	data = vmalloc(MEMWIN0_APERTURE/sizeof(__be32));
+	data = vmalloc(MEMWIN0_APERTURE);
 	if (!data)
 		return -ENOMEM;