From: John Whitmore <johnfwhitmore@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: devel@driverdev.osuosl.org, gregkh@linuxfoundation.org,
John Whitmore <johnfwhitmore@gmail.com>
Subject: [PATCH 13/13] staging:rtl8192u: Remove potential memory leak
Date: Wed, 26 Sep 2018 20:17:04 +0100 [thread overview]
Message-ID: <20180926191704.16322-14-johnfwhitmore@gmail.com> (raw)
In-Reply-To: <20180926191704.16322-1-johnfwhitmore@gmail.com>
Add call to ieee80211_networks_free() to avoid potential memory
leak if allocation of pHTInfo fails.
If the third allocation fails only the first successful allocation
is freed, not the second.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
drivers/staging/rtl8192u/ieee80211/ieee80211_module.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
index 90a097f2cd4e..aada077ced0f 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
@@ -159,6 +159,11 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
ieee->pHTInfo = kzalloc(sizeof(RT_HIGH_THROUGHPUT), GFP_KERNEL);
if (ieee->pHTInfo == NULL) {
IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't alloc memory for HTInfo\n");
+
+ /* By this point in code ieee80211_networks_allocate() has been
+ * successfully called so the memory allocated should be freed
+ */
+ ieee80211_networks_free(ieee);
goto failed;
}
HTUpdateDefaultSetting(ieee);
--
2.18.0
prev parent reply other threads:[~2018-09-26 19:17 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-26 19:16 [PATCH 00/13] staging:rtl8192u: Style & memory leak fix John Whitmore
2018-09-26 19:16 ` [PATCH 01/13] staging:rtl8192u: Remove HTHalfMcsToDataRate() - Style John Whitmore
2018-09-26 19:16 ` [PATCH 02/13] staging:rtl8192u: Make HTMcsToDataRate static " John Whitmore
2018-09-26 19:16 ` [PATCH 03/13] staging:rtl8192u: Remove definition of HTSetConnectBwMode " John Whitmore
2018-09-26 19:16 ` [PATCH 04/13] staging:rtl8192u: Move HTSetConnectBwModeCallback() " John Whitmore
2018-09-26 19:16 ` [PATCH 05/13] staging:rtl8192u: Remove AdvCoding and GreenField " John Whitmore
2018-09-28 12:35 ` Greg KH
2018-09-28 22:38 ` John Whitmore
2018-09-28 14:31 ` Dan Carpenter
2018-09-28 22:32 ` John Whitmore
2018-09-26 19:16 ` [PATCH 06/13] staging:rtl8192u: Remove TxSTBC and RxSTBC " John Whitmore
2018-09-28 12:36 ` Greg KH
2018-09-28 14:32 ` Dan Carpenter
2018-09-26 19:16 ` [PATCH 07/13] staging:rtl8192u: Remove DelayBA, PSMP and Rsvd1 " John Whitmore
2018-09-28 14:33 ` Dan Carpenter
2018-09-26 19:16 ` [PATCH 08/13] staging:rtl8192u: Remove LSigTxopProtect " John Whitmore
2018-09-26 19:17 ` [PATCH 09/13] staging:rtl8192u: Remove Rsvd2 " John Whitmore
2018-09-26 19:17 ` [PATCH 10/13] staging:rtl8192u: Remove ExtHTCapInfo " John Whitmore
2018-09-26 19:17 ` [PATCH 11/13] staging:rtl8192u: Remove TxBFCap " John Whitmore
2018-09-26 19:17 ` [PATCH 12/13] staging:rtl8192u: Remove ASCap " John Whitmore
2018-09-26 19:17 ` John Whitmore [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180926191704.16322-14-johnfwhitmore@gmail.com \
--to=johnfwhitmore@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome