be2net: Missing byteswap in be_get_fw_log_level causes oops on PowerPC

We are seeing an oops in be_get_fw_log_level on ppc64 where we walk
off the end of memory.

commit 941a77d582c8 (be2net: Fix to allow get/set of debug levels in
the firmware.) requires byteswapping of num_modes and num_modules.

Cc: stable@vger.kernel.org # 3.5+
Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Sathya Perla <sperla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index e34be1c7ae8aa4b3808365b5eee9fb40407e834d..c0e700653f965ef204ba38286b33dae76289d897 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -910,8 +910,9 @@ static void be_set_fw_log_level(struct be_adapter *adapter, u32 level)
        if (!status) {
                cfgs = (struct be_fat_conf_params *)(extfat_cmd.va +
                                        sizeof(struct be_cmd_resp_hdr));
-               for (i = 0; i < cfgs->num_modules; i++) {
-                       for (j = 0; j < cfgs->module[i].num_modes; j++) {
+               for (i = 0; i < le32_to_cpu(cfgs->num_modules); i++) {
+                       u32 num_modes = le32_to_cpu(cfgs->module[i].num_modes);
+                       for (j = 0; j < num_modes; j++) {
                                if (cfgs->module[i].trace_lvl[j].mode ==
                                                                MODE_UART)
                                        cfgs->module[i].trace_lvl[j].dbg_lvl =

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 4d967717449067d2802d09957a48c66f0b4241aa..4e81401259f9d04fca33a13b6904f811ca63f228 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -3579,7 +3579,7 @@ u32 be_get_fw_log_level(struct be_adapter *adapter)
        if (!status) {
                cfgs = (struct be_fat_conf_params *)(extfat_cmd.va +
                                                sizeof(struct be_cmd_resp_hdr));
-               for (j = 0; j < cfgs->module[0].num_modes; j++) {
+               for (j = 0; j < le32_to_cpu(cfgs->module[0].num_modes); j++) {
                        if (cfgs->module[0].trace_lvl[j].mode == MODE_UART)
                                level = cfgs->module[0].trace_lvl[j].dbg_lvl;
                }