diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-11-21 01:26:49 -0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-02 00:12:05 -0500 |
| commit | 571d6eee9b5bce28fcbeb7588890ad5ca3f8c718 (patch) | |
| tree | 38ad5d544dc9c14fc49a03957c24ee7a2e450b60 /net/ieee80211/softmac | |
| parent | 8e87295b9578fa46b5f325a7dc42ddbbdad6e0d0 (diff) | |
| download | kernel-crypto-571d6eee9b5bce28fcbeb7588890ad5ca3f8c718.tar.gz kernel-crypto-571d6eee9b5bce28fcbeb7588890ad5ca3f8c718.tar.xz kernel-crypto-571d6eee9b5bce28fcbeb7588890ad5ca3f8c718.zip | |
[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/softmac')
| -rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_auth.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c index 95e5287e12b..0612015f1c7 100644 --- a/net/ieee80211/softmac/ieee80211softmac_auth.c +++ b/net/ieee80211/softmac/ieee80211softmac_auth.c @@ -216,10 +216,16 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth) 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. |