diff options
author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-11-20 22:26:49 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-12-02 00:12:05 -0500 |
commit | 571d6eee9b5bce28fcbeb7588890ad5ca3f8c718 (patch) | |
tree | 38ad5d544dc9c14fc49a03957c24ee7a2e450b60 /net/ieee80211/ieee80211_rx.c | |
parent | 8e87295b9578fa46b5f325a7dc42ddbbdad6e0d0 (diff) |
[PATCH] Check ieee80211softmac_auth_resp kmalloc result
And use kmemdup and kzalloc where applicable
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/ieee80211/ieee80211_rx.c')
-rw-r--r-- | net/ieee80211/ieee80211_rx.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index ce28d571afac..d97e5412e31b 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c | |||
@@ -1304,12 +1304,11 @@ static int ieee80211_parse_info_param(struct ieee80211_info_element | |||
1304 | case MFIE_TYPE_IBSS_DFS: | 1304 | case MFIE_TYPE_IBSS_DFS: |
1305 | if (network->ibss_dfs) | 1305 | if (network->ibss_dfs) |
1306 | break; | 1306 | break; |
1307 | network->ibss_dfs = | 1307 | network->ibss_dfs = kmemdup(info_element->data, |
1308 | kmalloc(info_element->len, GFP_ATOMIC); | 1308 | info_element->len, |
1309 | GFP_ATOMIC); | ||
1309 | if (!network->ibss_dfs) | 1310 | if (!network->ibss_dfs) |
1310 | return 1; | 1311 | return 1; |
1311 | memcpy(network->ibss_dfs, info_element->data, | ||
1312 | info_element->len); | ||
1313 | network->flags |= NETWORK_HAS_IBSS_DFS; | 1312 | network->flags |= NETWORK_HAS_IBSS_DFS; |
1314 | break; | 1313 | break; |
1315 | 1314 | ||