be2net: Missing byteswap in be_get_fw_log_level causes oops on PowerPC

commit ac46a4623815113a0305b2a491c125f473a88c53 upstream.

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.

Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Sathya Perla <sperla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 63e51d476900f50a9eeed1942fd6ed0466cacda3..59ee51afd38816881648167c108d5532532be6ab 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 501dfa9c88ec4cfad5ea5b642f6e78decbb8f731..bd5cf7e96e2d94c3525c4475e1df3e3e9b73c079 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -3479,7 +3479,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;
                }