pull request: iwlwifi 2014-03-11

pull request: iwlwifi 2014-03-11

[Emmanuel Grumbach]

[-- Attachment #1: Type: text/plain, Size: 963 bytes --]

Hi John,

One more bugfix - this bug has been there forever, so it might not be all that much important. Your call.

We were sending a host command while the mutex wasn't held. This led to hard-to-catch races.

Please pull - thanks.


The following changes since commit acfcd9ed588465e48efe5ceb67177096d51c95a9:

  iwlwifi: fix and add 7265 series HW IDs (2014-03-04 19:30:06 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git for-john

for you to fetch changes up to 82e5a649453a3cf23516277abb84273768a1592b:

  iwlwifi: dvm: take mutex when sending SYNC BT config command (2014-03-11 13:15:16 +0200)

----------------------------------------------------------------
Emmanuel Grumbach (1):
      iwlwifi: dvm: take mutex when sending SYNC BT config command

 drivers/net/wireless/iwlwifi/dvm/main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]

[PATCH] iwlwifi: dvm: take mutex when sending SYNC BT config command

[Emmanuel Grumbach]

From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

There is a flow in which we send the host command in SYNC
mode, but we don't take priv->mutex.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1046495

Cc: <stable@vger.kernel.org>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
 drivers/net/wireless/iwlwifi/dvm/main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
index ba1b1ea..ea7e70c 100644
--- a/drivers/net/wireless/iwlwifi/dvm/main.c
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
@@ -252,13 +252,17 @@ static void iwl_bg_bt_runtime_config(struct work_struct *work)
 	struct iwl_priv *priv =
 		container_of(work, struct iwl_priv, bt_runtime_config);
 
+	mutex_lock(&priv->mutex);
 	if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-		return;
+		goto out;
 
 	/* dont send host command if rf-kill is on */
 	if (!iwl_is_ready_rf(priv))
-		return;
+		goto out;
+
 	iwlagn_send_advance_bt_config(priv);
+out:
+	mutex_unlock(&priv->mutex);
 }
 
 static void iwl_bg_bt_full_concurrency(struct work_struct *work)
-- 
1.8.3.2

Re: pull request: iwlwifi 2014-03-11

[John W. Linville]

On Tue, Mar 11, 2014 at 01:49:25PM +0200, Emmanuel Grumbach wrote:
> Hi John,
> 
> One more bugfix - this bug has been there forever, so it might not be all that much important. Your call.
> 
> We were sending a host command while the mutex wasn't held. This led to hard-to-catch races.
> 
> Please pull - thanks.
> 
> 
> The following changes since commit acfcd9ed588465e48efe5ceb67177096d51c95a9:
> 
>   iwlwifi: fix and add 7265 series HW IDs (2014-03-04 19:30:06 +0200)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git for-john
> 
> for you to fetch changes up to 82e5a649453a3cf23516277abb84273768a1592b:
> 
>   iwlwifi: dvm: take mutex when sending SYNC BT config command (2014-03-11 13:15:16 +0200)

Pulling now (for -next)...

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.