Skip to contentSkip to conversation

netlink: fix station_info pertid memory leak

PATCH In review Andy Strohman 2 participants 2 messages May 25, 2019 – May 27, 2019 802.11 (including cfg80211/NL80211)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 netlink: fix station_info pertid memory leak

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.

Fixes 8689c051a201 ("cfg80211: dynamically allocate per-tid stats for station info")
---
 net/wireless/nl80211.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
net/wireless/nl80211.c +3 -1
index fffe4b371e23..a82ecfe14d8d 100644
@@ -4855,8 +4855,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) ||
Signature · 1 line
2.17.1
#1 lore raw
Quoted 11 lines · Andy Strohman

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.

Fixes 8689c051a201 ("cfg80211: dynamically allocate per-tid stats for station info")
---
 net/wireless/nl80211.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

The correct prefix should be "nl80211:".

Signature · 1 line
Kalle Valo