lkml.org 
[lkml]   [2014]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 26/48] iwlwifi: dvm: take mutex when sending SYNC BT config command
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

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

    commit 82e5a649453a3cf23516277abb84273768a1592b upstream.

    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

    Reviewed-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

    --- 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(str
    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)



    \
     
     \ /
      Last update: 2014-05-11 23:21    [W:2.690 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site