From: chaitanya.mgit@gmail.com
To: johannes@sipsolutions.net, linux-wireless@vger.kernel.org
Cc: Chaitanya Tata <chaitanya.mgit@gmail.com>,
Chaitanya Tata <chaitanya.tata@bluwireless.com>
Subject: [PATCHv2] cfg80211: Skip key deletion for open associations
Date: Tue, 26 Jan 2021 00:50:46 +0530 [thread overview]
Message-ID: <20210125192046.975-1-chaitanya.mgit@gmail.com> (raw)
From: Chaitanya Tata <chaitanya.mgit@gmail.com>
From: Chaitanya Tata <chaitanya.mgit@gmail.com>
If the association is open (no authentication and encryption) no need
to delete the keys, though this is handled by all drivers, this is
unnecessary.
Signed-off-by: Chaitanya Tata <chaitanya.tata@bluwireless.com>
---
v2: Move kfree after check.
---
net/wireless/sme.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 38df713f2e2e..016655595b48 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -1098,8 +1098,6 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
wdev->current_bss = NULL;
wdev->ssid_len = 0;
wdev->conn_owner_nlportid = 0;
- kfree_sensitive(wdev->connect_keys);
- wdev->connect_keys = NULL;
nl80211_send_disconnected(rdev, dev, reason, ie, ie_len, from_ap);
@@ -1113,7 +1111,7 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
* Delete all the keys ... pairwise keys can't really
* exist any more anyway, but default keys might.
*/
- if (rdev->ops->del_key) {
+ if (wdev->connect_keys && rdev->ops->del_key) {
int max_key_idx = 5;
if (wiphy_ext_feature_isset(
@@ -1127,6 +1125,9 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
rdev_del_key(rdev, dev, i, false, NULL);
}
+ kfree_sensitive(wdev->connect_keys);
+ wdev->connect_keys = NULL;
+
rdev_set_qos_map(rdev, dev, NULL);
#ifdef CONFIG_CFG80211_WEXT
--
2.17.1
next reply other threads:[~2021-01-26 19:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 19:20 chaitanya.mgit [this message]
2021-01-25 19:51 ` [PATCHv2] cfg80211: Skip key deletion for open associations Johannes Berg
2021-01-25 20:07 ` Krishna Chaitanya
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=20210125192046.975-1-chaitanya.mgit@gmail.com \
--to=chaitanya.mgit@gmail.com \
--cc=chaitanya.tata@bluwireless.com \
--cc=johannes@sipsolutions.net \
--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: link
Be 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.