diff options
| author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2011-08-24 00:44:32 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:39:56 -0700 |
| commit | 8a9f335df5baa97f3901378335ff10f3fecf36de (patch) | |
| tree | 29537c738161edd5254e320802c83b477561ff68 /drivers/net/wireless/ath/carl9170 | |
| parent | 0b1511be7b2d36524e45a2fd70d92a2975ef0b6f (diff) | |
| download | kernel_samsung_smdk4412-8a9f335df5baa97f3901378335ff10f3fecf36de.zip kernel_samsung_smdk4412-8a9f335df5baa97f3901378335ff10f3fecf36de.tar.gz kernel_samsung_smdk4412-8a9f335df5baa97f3901378335ff10f3fecf36de.tar.bz2 | |
carl9170: Fix mismatch in carl9170_op_set_key mutex lock-unlock
commit 66cb54bd24086b2d871a03035de9b0e79b2b725e upstream.
If is_main_vif(ar, vif) reports that we have to fall back
to software encryption, we goto err_softw; before locking ar->mutex.
As a result, we have unprotected call to carl9170_set_operating_mode
and unmatched mutex_unlock.
The patch fix the issue by adding mutex_lock before goto.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-By: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net/wireless/ath/carl9170')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c index 54d093c..b54966c 100644 --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c @@ -1066,8 +1066,10 @@ static int carl9170_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, * the high througput speed in 802.11n networks. */ - if (!is_main_vif(ar, vif)) + if (!is_main_vif(ar, vif)) { + mutex_lock(&ar->mutex); goto err_softw; + } /* * While the hardware supports *catch-all* key, for offloading |