summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2013-04-22 22:40:07 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-19 10:54:44 -0700
commit71ee19e72689cb4568e042ed49d1ac27336a10d6 (patch)
tree1e4fa74dd677c7e18e9f77e84a3c3d8c7306c741
parent8e1546d7e14ef043ff74070cea0aff55ba2f600c (diff)
downloadlinux-3.10-71ee19e72689cb4568e042ed49d1ac27336a10d6.tar.gz
linux-3.10-71ee19e72689cb4568e042ed49d1ac27336a10d6.tar.bz2
linux-3.10-71ee19e72689cb4568e042ed49d1ac27336a10d6.zip
sfc: Fix naming of MTD partitions for FPGA bitfiles
[ Upstream commit 89cc80a44b7c320e08599cb86f6aef0ead8986a1 ] efx_mcdi_get_board_cfg() uses a buffer for the firmware response that is only large enough to hold subtypes for the originally defined set of NVRAM partitions. Longer responses are truncated, and we may read off the end of the buffer when copying out subtypes for additional partitions. In particular, this can result in the MTD partition for an FPGA bitfile being named e.g. 'eth5 sfc_fpga:00' when it should be 'eth5 sfc_fpga:01'. This means the firmware update tool (sfupdate) can't tell which bitfile should be written to the partition. Correct the response buffer size. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/ethernet/sfc/mcdi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c
index eb85217ce3a..192026f0e8d 100644
--- a/drivers/net/ethernet/sfc/mcdi.c
+++ b/drivers/net/ethernet/sfc/mcdi.c
@@ -640,7 +640,7 @@ fail:
int efx_mcdi_get_board_cfg(struct efx_nic *efx, u8 *mac_address,
u16 *fw_subtype_list, u32 *capabilities)
{
- uint8_t outbuf[MC_CMD_GET_BOARD_CFG_OUT_LENMIN];
+ uint8_t outbuf[MC_CMD_GET_BOARD_CFG_OUT_LENMAX];
size_t outlen, offset, i;
int port_num = efx_port_num(efx);
int rc;