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

Commit 90ad0be8 authored by Douglas Anderson's avatar Douglas Anderson Committed by Kalle Valo
Browse files

mwifiex: Don't release cmd_pending_q_lock while iterating 



Just like in the previous patch ("mwifiex: Don't release
tx_ba_stream_tbl_lock while iterating"), in
mwifiex_cancel_all_pending_cmd() we were itearting over a list protected
by a spinlock.  Again, it is not safe to release the spinlock while
iterating.  Don't do it.

Luckily in this case there should be no need to release the spinlock.
This is evidenced by:

1. The only function called while the spinlock was released was
   mwifiex_recycle_cmd_node()
2. Aside from atomic functions (which are safe to call), the only
   function called by mwifiex_recycle_cmd_node() was
   mwifiex_insert_cmd_to_free_q().
3. It can be seen in mwifiex_cancel_pending_scan_cmd() that it's OK to
   call mwifiex_insert_cmd_to_free_q() while holding a different
   spinlock (scan_pending_q_lock), so in general holding a spinlock
   should be OK.
4. It doesn't appear that mwifiex_insert_cmd_to_free_q() has any
   interaction with the cmd_pending_q_lock

No known bugs are fixed with this change, but as with other similar
changes this could fix random list corruption.

Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent e0b636e5

drivers/net/wireless/marvell/mwifiex/cmdevt.c

+0 −2
Original line number Diff line number Diff line
@@ -1056,12 +1056,10 @@ mwifiex_cancel_all_pending_cmd(struct mwifiex_adapter *adapter) 
	list_for_each_entry_safe(cmd_node, tmp_node,

				 &adapter->cmd_pending_q, list) {

		list_del(&cmd_node->list);

		spin_unlock_irqrestore(&adapter->cmd_pending_q_lock, flags);



		if (cmd_node->wait_q_enabled)

			adapter->cmd_wait_q.status = -1;

		mwifiex_recycle_cmd_node(adapter, cmd_node);

		spin_lock_irqsave(&adapter->cmd_pending_q_lock, flags);

	}

	spin_unlock_irqrestore(&adapter->cmd_pending_q_lock, flags);

	spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, cmd_flags);