From 479c407c1c949cb8584e26ee6dc1fc6fd37dd0f0 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 5 Jul 2011 00:04:42 +0100 Subject: [PATCH] --- yaml --- r: 328014 b: refs/heads/master c: e3f5ec1108ee01b555d5894722884e40dbec058f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/sfc/mcdi.c | 6 ++++-- trunk/drivers/net/ethernet/sfc/mtd.c | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 86a7a0b1c4c8..90562068537e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfeed902946a31692e7a24ed355b6d13ac37d014 +refs/heads/master: e3f5ec1108ee01b555d5894722884e40dbec058f diff --git a/trunk/drivers/net/ethernet/sfc/mcdi.c b/trunk/drivers/net/ethernet/sfc/mcdi.c index 578e5f72aabe..e855f4cddb4e 100644 --- a/trunk/drivers/net/ethernet/sfc/mcdi.c +++ b/trunk/drivers/net/ethernet/sfc/mcdi.c @@ -683,12 +683,14 @@ int efx_mcdi_get_board_cfg(struct efx_nic *efx, u8 *mac_address, if (mac_address) memcpy(mac_address, outbuf + offset, ETH_ALEN); if (fw_subtype_list) { + /* Byte-swap and truncate or zero-pad as necessary */ offset = MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_OFST; for (i = 0; - i < MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_MINNUM; + i < MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_MAXNUM; i++) { fw_subtype_list[i] = - le16_to_cpup((__le16 *)(outbuf + offset)); + (offset + 2 <= outlen) ? + le16_to_cpup((__le16 *)(outbuf + offset)) : 0; offset += 2; } } diff --git a/trunk/drivers/net/ethernet/sfc/mtd.c b/trunk/drivers/net/ethernet/sfc/mtd.c index 758148379b0e..8f4604d5d642 100644 --- a/trunk/drivers/net/ethernet/sfc/mtd.c +++ b/trunk/drivers/net/ethernet/sfc/mtd.c @@ -627,7 +627,8 @@ static int siena_mtd_get_fw_subtypes(struct efx_nic *efx, struct efx_mtd *efx_mtd) { struct efx_mtd_partition *part; - uint16_t fw_subtype_list[MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_MINNUM]; + uint16_t fw_subtype_list[ + MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_MAXNUM]; int rc; rc = efx_mcdi_get_board_cfg(efx, NULL, fw_subtype_list, NULL);