Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac46a462 authored by Anton Blanchard's avatar Anton Blanchard Committed by David S. Miller
Browse files

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 941a77d5 (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: default avatarAnton Blanchard <anton@samba.org>
Acked-by: default avatarSathya Perla <sperla@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 57dbf29a
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -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 =
+1 −1
Original line number Diff line number Diff line
@@ -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;
		}