2018-10-05 13:57:39

by Jia-Ju Bai

Subject: [PATCH] net: wireless: iwlegacy: Add a lock assertion in il4965_send_rxon_assoc()

The variables il->staging.filter_flags, rxon1->filter_flags and
rxon2->filter_flags need to be protected by the mutex lock il->mutex.
This patch adds a lock assertion of il->mutex to check whether
this lock is held.

Signed-off-by: Jia-Ju Bai <[email protected]>
---
drivers/net/wireless/intel/iwlegacy/4965.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/net/wireless/intel/iwlegacy/4965.c b/drivers/net/wireless/intel/iwlegacy/4965.c
index c3c638ed0ed7..ce4144a89217 100644
--- a/drivers/net/wireless/intel/iwlegacy/4965.c
+++ b/drivers/net/wireless/intel/iwlegacy/4965.c
@@ -1297,6 +1297,8 @@ il4965_send_rxon_assoc(struct il_priv *il)
const struct il_rxon_cmd *rxon1 = &il->staging;
const struct il_rxon_cmd *rxon2 = &il->active;

+ lockdep_assert_held(&il->mutex);
+
if (rxon1->flags == rxon2->flags &&
rxon1->filter_flags == rxon2->filter_flags &&
rxon1->cck_basic_rates == rxon2->cck_basic_rates &&
--
2.17.0

2018-10-08 08:54:37

by Stanislaw Gruszka

Subject: Re: [PATCH] net: wireless: iwlegacy: Add a lock assertion in il4965_send_rxon_assoc()

On Fri, Oct 05, 2018 at 09:55:46PM +0800, Jia-Ju Bai wrote:
> The variables il->staging.filter_flags, rxon1->filter_flags and
> rxon2->filter_flags need to be protected by the mutex lock il->mutex.
> This patch adds a lock assertion of il->mutex to check whether
> this lock is held.
>
> Signed-off-by: Jia-Ju Bai <[email protected]>
Acked-by: Stanislaw Gruszka <[email protected]>

2018-10-13 17:03:32

by Kalle Valo

Subject: Re: [PATCH] iwlegacy: Add a lock assertion in il4965_send_rxon_assoc()

Jia-Ju Bai <[email protected]> wrote:

> The variables il->staging.filter_flags, rxon1->filter_flags and
> rxon2->filter_flags need to be protected by the mutex lock il->mutex.
> This patch adds a lock assertion of il->mutex to check whether
> this lock is held.
>
> Signed-off-by: Jia-Ju Bai <[email protected]>
> Acked-by: Stanislaw Gruszka <[email protected]>

Patch applied to wireless-drivers-next.git, thanks.

52a312673aff iwlegacy: Add a lock assertion in il4965_send_rxon_assoc()

--
https://patchwork.kernel.org/patch/10628205/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches