lkml.org 
[lkml]   [2018]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 200/310] iwlwifi: tt: move ucode_loaded check under mutex
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Johannes Berg <johannes.berg@intel.com>


    [ Upstream commit d9954405758a0cbbe258d9b4d4dc12a06fa48a28 ]

    The ucode_loaded check should be under the mutex, since it can
    otherwise change state after we looked at it and before we got
    the mutex. Fix that.

    Fixes: 5c89e7bc557e ("iwlwifi: mvm: add registration to cooling device")
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    --- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
    +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
    @@ -790,11 +790,13 @@ static int iwl_mvm_tcool_set_cur_state(s
    struct iwl_mvm *mvm = (struct iwl_mvm *)(cdev->devdata);
    int ret;

    - if (!mvm->ucode_loaded || !(mvm->cur_ucode == IWL_UCODE_REGULAR))
    - return -EIO;
    -
    mutex_lock(&mvm->mutex);

    + if (!mvm->ucode_loaded || !(mvm->cur_ucode == IWL_UCODE_REGULAR)) {
    + ret = -EIO;
    + goto unlock;
    + }
    +
    if (new_state >= ARRAY_SIZE(iwl_mvm_cdev_budgets)) {
    ret = -EINVAL;
    goto unlock;

    \
     
     \ /
      Last update: 2018-04-11 21:38    [W:4.846 / U:0.404 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site