Commit 0a7701b4 authored by Andreas Kemnade's avatar Andreas Kemnade Committed by Kalle Valo
Browse files

libertas: fix pointer bugs for PS_MODE commands 



struct cmd_ds_802_11_ps_mode
contains the command header and a pointer to it was
initialized with data points to the body which leads to
mis-interpretation of the cmd_ds_802_11_ps_mode.action member.
cmd[0] contains the header, &cmd[1] points beyond that.
cmdnode->cmdbuf is a pointer to the command buffer
This piece of code was unused since power saving was
not enabled.

Signed-off-by: default avatarAndreas Kemnade <andreas@kemnade.info>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent efdf0e39

drivers/net/wireless/marvell/libertas/cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ static void lbs_queue_cmd(struct lbs_private *priv, 


	/* Exit_PS command needs to be queued in the header always. */

	if (le16_to_cpu(cmdnode->cmdbuf->command) == CMD_802_11_PS_MODE) {

		struct cmd_ds_802_11_ps_mode *psm = (void *) &cmdnode->cmdbuf;

		struct cmd_ds_802_11_ps_mode *psm = (void *)cmdnode->cmdbuf;



		if (psm->action == cpu_to_le16(PS_MODE_ACTION_EXIT_PS)) {

			if (priv->psstate != PS_STATE_FULL_POWER)
@@ -1387,7 +1387,7 @@ int lbs_execute_next_command(struct lbs_private *priv) 
				 * PS command. Ignore it if it is not Exit_PS.

				 * otherwise send it down immediately.

				 */

				struct cmd_ds_802_11_ps_mode *psm = (void *)&cmd[1];

				struct cmd_ds_802_11_ps_mode *psm = (void *)cmd;



				lbs_deb_host(

				       "EXEC_NEXT_CMD: PS cmd, action 0x%02x\n",

drivers/net/wireless/marvell/libertas/cmdresp.c

+4 −1
Original line number Diff line number Diff line
@@ -123,7 +123,10 @@ int lbs_process_command_response(struct lbs_private *priv, u8 *data, u32 len) 
	priv->cmd_timed_out = 0;



	if (respcmd == CMD_RET(CMD_802_11_PS_MODE)) {

		struct cmd_ds_802_11_ps_mode *psmode = (void *) &resp[1];

		/* struct cmd_ds_802_11_ps_mode also contains

		 * the header

		 */

		struct cmd_ds_802_11_ps_mode *psmode = (void *)resp;

		u16 action = le16_to_cpu(psmode->action);



		lbs_deb_host(

CRA Git | Maintained and supported by SUSTech CRA and CCSE