From: Sujith Manoharan <sujith@msujith.org> To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org Subject: [PATCH 2/3] ath10k: Fix locking for WEP keys Date: Mon, 24 Nov 2014 08:07:36 +0530 [thread overview] Message-ID: <1416796657-24657-3-git-send-email-sujith@msujith.org> (raw) In-Reply-To: <1416796657-24657-1-git-send-email-sujith@msujith.org> From: Sujith Manoharan <c_manoha@qca.qualcomm.com> peer->keys needs to be protected by data_lock since it is also accessed from the WMI path. Both install() and clear() routines for peer keys modify the key contents, so use the data_lock to avoid races. Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com> --- drivers/net/wireless/ath/ath10k/mac.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 23116c2..2200c64 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -136,7 +136,9 @@ static int ath10k_install_peer_wep_keys(struct ath10k_vif *arvif, if (ret) return ret; + spin_lock_bh(&ar->data_lock); peer->keys[i] = arvif->wep_keys[i]; + spin_unlock_bh(&ar->data_lock); } return 0; @@ -173,7 +175,9 @@ static int ath10k_clear_peer_keys(struct ath10k_vif *arvif, ath10k_warn(ar, "failed to remove peer wep key %d: %d\n", i, ret); + spin_lock_bh(&ar->data_lock); peer->keys[i] = NULL; + spin_unlock_bh(&ar->data_lock); } return first_errno; -- 2.1.3
WARNING: multiple messages have this Message-ID (diff)
From: Sujith Manoharan <sujith@msujith.org> To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org Subject: [PATCH 2/3] ath10k: Fix locking for WEP keys Date: Mon, 24 Nov 2014 08:07:36 +0530 [thread overview] Message-ID: <1416796657-24657-3-git-send-email-sujith@msujith.org> (raw) In-Reply-To: <1416796657-24657-1-git-send-email-sujith@msujith.org> From: Sujith Manoharan <c_manoha@qca.qualcomm.com> peer->keys needs to be protected by data_lock since it is also accessed from the WMI path. Both install() and clear() routines for peer keys modify the key contents, so use the data_lock to avoid races. Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com> --- drivers/net/wireless/ath/ath10k/mac.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 23116c2..2200c64 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -136,7 +136,9 @@ static int ath10k_install_peer_wep_keys(struct ath10k_vif *arvif, if (ret) return ret; + spin_lock_bh(&ar->data_lock); peer->keys[i] = arvif->wep_keys[i]; + spin_unlock_bh(&ar->data_lock); } return 0; @@ -173,7 +175,9 @@ static int ath10k_clear_peer_keys(struct ath10k_vif *arvif, ath10k_warn(ar, "failed to remove peer wep key %d: %d\n", i, ret); + spin_lock_bh(&ar->data_lock); peer->keys[i] = NULL; + spin_unlock_bh(&ar->data_lock); } return first_errno; -- 2.1.3 _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2014-11-24 2:35 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-11-24 2:37 [PATCH 0/3] ath10k patches Sujith Manoharan 2014-11-24 2:37 ` Sujith Manoharan 2014-11-24 2:37 ` [PATCH 1/3] ath10k: Fix shared WEP Sujith Manoharan 2014-11-24 2:37 ` Sujith Manoharan 2014-11-24 15:12 ` Kalle Valo 2014-11-24 15:12 ` Kalle Valo 2014-11-25 5:28 ` Sujith Manoharan 2014-11-25 5:28 ` Sujith Manoharan 2014-11-25 5:53 ` Kalle Valo 2014-11-25 5:53 ` Kalle Valo 2014-11-24 2:37 ` Sujith Manoharan [this message] 2014-11-24 2:37 ` [PATCH 2/3] ath10k: Fix locking for WEP keys Sujith Manoharan 2014-11-24 15:15 ` Kalle Valo 2014-11-24 15:15 ` Kalle Valo 2014-11-24 2:37 ` [PATCH 3/3] ath10k: Fix bug reported by lockdep Sujith Manoharan 2014-11-24 2:37 ` Sujith Manoharan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1416796657-24657-3-git-send-email-sujith@msujith.org \ --to=sujith@msujith.org \ --cc=ath10k@lists.infradead.org \ --cc=linux-wireless@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.