mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-09-22 04:15:02 +00:00
cfg80211: fix leaks of wdev->conn->ie
This only occurs in the following error situations: - driver calls connect_result with failure - error scheduling authentication on connect - error initiating scan (to get BSSID and channel) on connect - userspace calls disconnect while in the SCANNING or SCAN_AGAIN states Signed-off-by: David Kilroy <kilroyd@googlemail.com> Reviewed-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
eeef41854d
commit
415ad1efae
1 changed files with 4 additions and 0 deletions
|
@ -395,6 +395,8 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
|
||||||
|
|
||||||
if (status != WLAN_STATUS_SUCCESS) {
|
if (status != WLAN_STATUS_SUCCESS) {
|
||||||
wdev->sme_state = CFG80211_SME_IDLE;
|
wdev->sme_state = CFG80211_SME_IDLE;
|
||||||
|
if (wdev->conn)
|
||||||
|
kfree(wdev->conn->ie);
|
||||||
kfree(wdev->conn);
|
kfree(wdev->conn);
|
||||||
wdev->conn = NULL;
|
wdev->conn = NULL;
|
||||||
kfree(wdev->connect_keys);
|
kfree(wdev->connect_keys);
|
||||||
|
@ -779,6 +781,7 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (err) {
|
if (err) {
|
||||||
|
kfree(wdev->conn->ie);
|
||||||
kfree(wdev->conn);
|
kfree(wdev->conn);
|
||||||
wdev->conn = NULL;
|
wdev->conn = NULL;
|
||||||
wdev->sme_state = CFG80211_SME_IDLE;
|
wdev->sme_state = CFG80211_SME_IDLE;
|
||||||
|
@ -848,6 +851,7 @@ int __cfg80211_disconnect(struct cfg80211_registered_device *rdev,
|
||||||
(wdev->conn->state == CFG80211_CONN_SCANNING ||
|
(wdev->conn->state == CFG80211_CONN_SCANNING ||
|
||||||
wdev->conn->state == CFG80211_CONN_SCAN_AGAIN)) {
|
wdev->conn->state == CFG80211_CONN_SCAN_AGAIN)) {
|
||||||
wdev->sme_state = CFG80211_SME_IDLE;
|
wdev->sme_state = CFG80211_SME_IDLE;
|
||||||
|
kfree(wdev->conn->ie);
|
||||||
kfree(wdev->conn);
|
kfree(wdev->conn);
|
||||||
wdev->conn = NULL;
|
wdev->conn = NULL;
|
||||||
wdev->ssid_len = 0;
|
wdev->ssid_len = 0;
|
||||||
|
|
Loading…
Reference in a new issue