diff options
| author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2012-08-08 19:44:21 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-08-10 14:50:25 -0400 |
| commit | 60f53cf99060472973f16452116d9c467f8b08c6 (patch) | |
| tree | be40e99bdcfe442e9122a210418c1fa69162fb31 | |
| parent | f41a9b3b15e0f74656f69e6da403d870c53ea4e6 (diff) | |
| download | linux-3.10-60f53cf99060472973f16452116d9c467f8b08c6.tar.gz linux-3.10-60f53cf99060472973f16452116d9c467f8b08c6.tar.bz2 linux-3.10-60f53cf99060472973f16452116d9c467f8b08c6.zip | |
rndis_wlan: Fix potential memory leak in update_pmkid()
Do not leak memory by updating pointer with potentially NULL realloc return value.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index 241162e8111..7a4ae9ee1c6 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c @@ -1803,6 +1803,7 @@ static struct ndis_80211_pmkid *update_pmkid(struct usbnet *usbdev, struct cfg80211_pmksa *pmksa, int max_pmkids) { + struct ndis_80211_pmkid *new_pmkids; int i, err, newlen; unsigned int count; @@ -1833,11 +1834,12 @@ static struct ndis_80211_pmkid *update_pmkid(struct usbnet *usbdev, /* add new pmkid */ newlen = sizeof(*pmkids) + (count + 1) * sizeof(pmkids->bssid_info[0]); - pmkids = krealloc(pmkids, newlen, GFP_KERNEL); - if (!pmkids) { + new_pmkids = krealloc(pmkids, newlen, GFP_KERNEL); + if (!new_pmkids) { err = -ENOMEM; goto error; } + pmkids = new_pmkids; pmkids->length = cpu_to_le32(newlen); pmkids->bssid_info_count = cpu_to_le32(count + 1); |