: Check ieee80211softmac_auth_resp kmalloc result
Subsystems (2)
PATCH 1/11 : Check ieee80211softmac_auth_resp kmalloc result
And use kmemdup and kzalloc where applicable
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- net/ieee80211/ieee80211_module.c | 5 +---- net/ieee80211/ieee80211_rx.c | 7 +++---- net/ieee80211/softmac/ieee80211softmac_auth.c | 14 ++++++++++---- 3 files changed, 14 insertions(+), 12 deletions(-)
net/ieee80211/ieee80211_module.c +1 -4
@@ -67,7 +67,7 @@ static int ieee80211_networks_allocate(sreturn 0 ; ieee->networks = -kmalloc (MAX_NETWORK_COUNT *sizeof (struct ieee80211_network ), +kzalloc (MAX_NETWORK_COUNT *sizeof (struct ieee80211_network ),GFP_KERNEL );if (!ieee->networks) { printk(KERN_WARNING "%s: Out of memory allocating beacons\n",
@@ -75,9 +75,6 @@ static int ieee80211_networks_allocate(sreturn -ENOMEM ; } -memset (ieee->networks,0 , -MAX_NETWORK_COUNT *sizeof (struct ieee80211_network )); -return 0 ; }
net/ieee80211/ieee80211_rx.c +3 -4
@@ -1255,12 +1255,11 @@ #endifcase MFIE_TYPE_IBSS_DFS :if (network->ibss_dfs)break ; - network->ibss_dfs = -kmalloc (info_element->len,GFP_ATOMIC ); + network->ibss_dfs =kmemdup (info_element->data, + info_element->len, +GFP_ATOMIC );if (!network->ibss_dfs)return 1 ; -memcpy (network->ibss_dfs, info_element->data, - info_element->len); network->flags |=NETWORK_HAS_IBSS_DFS ;break ;
net/ieee80211/softmac/ieee80211softmac_auth.c +10 -4
@@ -216,10 +216,16 @@ ieee80211softmac_auth_resp(struct net_de net->challenge_len = *data++;if (net->challenge_len >WLAN_AUTH_CHALLENGE_LEN ) net->challenge_len =WLAN_AUTH_CHALLENGE_LEN ; -if (net->challenge !=NULL ) -kfree (net->challenge); - net->challenge =kmalloc (net->challenge_len,GFP_ATOMIC ); -memcpy (net->challenge, data, net->challenge_len); +kfree (net->challenge); + net->challenge =kmemdup (data, net->challenge_len, +GFP_ATOMIC ); +if (net->challenge ==NULL ) { + printkl(KERN_NOTICE PFX "Shared Key " +"Authentication failed due to " + "memory shortage.\n"); +spin_unlock_irqrestore (&mac->lock, flags); +break ; + } aq->state =IEEE80211SOFTMAC_AUTH_SHARED_RESPONSE ;/* We reuse the work struct from the auth request here.
Signature · 1 line
1.4.2.1.g3d5c