* [PATCH] cfg80211: fix leaks of wdev->conn->ie
@ 2009-08-18 23:43 David Kilroy
2009-08-19 7:52 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: David Kilroy @ 2009-08-18 23:43 UTC (permalink / raw)
To: linux-wireless; +Cc: David Kilroy, Johannes Berg
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>
Cc: Johannes Berg <johannes@sipsolutions.net>
---
I came across this while looking at my orinoco scanning issue. It's
possible I'm wrong...
---
net/wireless/sme.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 6fb6a70..9ddc00e 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -395,6 +395,8 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
if (status != WLAN_STATUS_SUCCESS) {
wdev->sme_state = CFG80211_SME_IDLE;
+ if (wdev->conn)
+ kfree(wdev->conn->ie);
kfree(wdev->conn);
wdev->conn = NULL;
kfree(wdev->connect_keys);
@@ -779,6 +781,7 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev,
}
}
if (err) {
+ kfree(wdev->conn->ie);
kfree(wdev->conn);
wdev->conn = NULL;
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_SCAN_AGAIN)) {
wdev->sme_state = CFG80211_SME_IDLE;
+ kfree(wdev->conn->ie);
kfree(wdev->conn);
wdev->conn = NULL;
wdev->ssid_len = 0;
--
1.6.3.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] cfg80211: fix leaks of wdev->conn->ie
2009-08-18 23:43 [PATCH] cfg80211: fix leaks of wdev->conn->ie David Kilroy
@ 2009-08-19 7:52 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2009-08-19 7:52 UTC (permalink / raw)
To: David Kilroy; +Cc: linux-wireless
[-- Attachment #1: Type: text/plain, Size: 1859 bytes --]
On Wed, 2009-08-19 at 00:43 +0100, David Kilroy wrote:
> 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>
> Cc: Johannes Berg <johannes@sipsolutions.net>
> ---
>
> I came across this while looking at my orinoco scanning issue. It's
> possible I'm wrong...
Yes, looks like I forgot these, thanks!
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
> ---
>
> net/wireless/sme.c | 4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/net/wireless/sme.c b/net/wireless/sme.c
> index 6fb6a70..9ddc00e 100644
> --- a/net/wireless/sme.c
> +++ b/net/wireless/sme.c
> @@ -395,6 +395,8 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
>
> if (status != WLAN_STATUS_SUCCESS) {
> wdev->sme_state = CFG80211_SME_IDLE;
> + if (wdev->conn)
> + kfree(wdev->conn->ie);
> kfree(wdev->conn);
> wdev->conn = NULL;
> kfree(wdev->connect_keys);
> @@ -779,6 +781,7 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev,
> }
> }
> if (err) {
> + kfree(wdev->conn->ie);
> kfree(wdev->conn);
> wdev->conn = NULL;
> 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_SCAN_AGAIN)) {
> wdev->sme_state = CFG80211_SME_IDLE;
> + kfree(wdev->conn->ie);
> kfree(wdev->conn);
> wdev->conn = NULL;
> wdev->ssid_len = 0;
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-08-19 7:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-08-18 23:43 [PATCH] cfg80211: fix leaks of wdev->conn->ie David Kilroy
2009-08-19 7:52 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).