* [PATCH] be2net: Missing byteswap in be_get_fw_log_level causes oops on PowerPC
@ 2012-07-25 1:05 Anton Blanchard
2012-07-25 12:18 ` Sathya.Perla
2012-07-25 22:24 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Anton Blanchard @ 2012-07-25 1:05 UTC (permalink / raw)
To: sathya.perla, subbu.seetharaman, ajit.khaparde, netdev
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>
---
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 63e51d4..59ee51a 100644
--- 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 501dfa9..bd5cf7e 100644
--- 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;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH] be2net: Missing byteswap in be_get_fw_log_level causes oops on PowerPC
2012-07-25 1:05 [PATCH] be2net: Missing byteswap in be_get_fw_log_level causes oops on PowerPC Anton Blanchard
@ 2012-07-25 12:18 ` Sathya.Perla
2012-07-25 22:24 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Sathya.Perla @ 2012-07-25 12:18 UTC (permalink / raw)
To: anton, subbu.seetharaman, Ajit.Khaparde, netdev
>-----Original Message-----
>From: Anton Blanchard [mailto:anton@samba.org]
>
>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>
Thanks for the fix!
>---
>
>diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c
>b/drivers/net/ethernet/emulex/benet/be_ethtool.c
>index 63e51d4..59ee51a 100644
>--- 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 501dfa9..bd5cf7e 100644
>--- 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;
> }
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] be2net: Missing byteswap in be_get_fw_log_level causes oops on PowerPC
2012-07-25 1:05 [PATCH] be2net: Missing byteswap in be_get_fw_log_level causes oops on PowerPC Anton Blanchard
2012-07-25 12:18 ` Sathya.Perla
@ 2012-07-25 22:24 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2012-07-25 22:24 UTC (permalink / raw)
To: anton; +Cc: sathya.perla, subbu.seetharaman, ajit.khaparde, netdev
From: Anton Blanchard <anton@samba.org>
Date: Wed, 25 Jul 2012 11:05:25 +1000
>
> 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>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-07-25 22:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-25 1:05 [PATCH] be2net: Missing byteswap in be_get_fw_log_level causes oops on PowerPC Anton Blanchard
2012-07-25 12:18 ` Sathya.Perla
2012-07-25 22:24 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).