diff options
| author | Andy Strohman <andrew@andrewstrohman.com> | 2019-05-24 23:27:29 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-25 11:36:01 +0800 |
| commit | 72dc6786d77a0c45cf68ccccff2225bd67b9cf82 (patch) | |
| tree | 191e7ce206b14685dae9105aa11546d8723e4ead | |
| parent | 1e1007ac47d85dacf6d45821a2870b6268499700 (diff) | |
| download | linux-stable-72dc6786d77a0c45cf68ccccff2225bd67b9cf82.tar.gz linux-stable-72dc6786d77a0c45cf68ccccff2225bd67b9cf82.tar.bz2 linux-stable-72dc6786d77a0c45cf68ccccff2225bd67b9cf82.zip | |
nl80211: fix station_info pertid memory leak
commit f77bf4863dc2218362f4227d56af4a5f3f08830c upstream.
When dumping stations, memory allocated for station_info's
pertid member will leak if the nl80211 header cannot be added to
the sk_buff due to insufficient tail room.
I noticed this leak in the kmalloc-2048 cache.
Cc: stable@vger.kernel.org
Fixes: 8689c051a201 ("cfg80211: dynamically allocate per-tid stats for station info")
Signed-off-by: Andy Strohman <andy@uplevelsystems.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/wireless/nl80211.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index adc274354fcf..8e2f03ab4cc9 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4611,8 +4611,10 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid, struct nlattr *sinfoattr, *bss_param; hdr = nl80211hdr_put(msg, portid, seq, flags, cmd); - if (!hdr) + if (!hdr) { + cfg80211_sinfo_release_content(sinfo); return -1; + } if (nla_put_u32(msg, NL80211_ATTR_IFINDEX, dev->ifindex) || nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, mac_addr) || |