Attachment 872691 Details for Bug 1046495 – fix

[patch] fix

0001-iwlwifi-dvm-take-mutex-when-sending-SYNC-BT-config-c.patch (text/plain), 1.38 KB, created by Emmanuel Grumbach on 2014-03-10 13:27:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emmanuel Grumbach

Created: 2014-03-10 13:27:03 UTC

Size: 1.38 KB

patch

obsolete

>From a60f6c37a8fe2ab63096b6292401e32f50570468 Mon Sep 17 00:00:00 2001
>From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
>Date: Mon, 10 Mar 2014 15:22:03 +0200
>Subject: [PATCH] iwlwifi: dvm: take mutex when sending SYNC BT config command
>
>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>
>Change-Id: Idf3b9409e15334009a9af902ac5ebb040fa17a02
>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 4a9cc10..4c6c118 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
>

Actions: View | Diff

Attachments on bug 1046495: 841636 | 872676 | 872691