| Message ID | 20190525062729.8504-1-andy@uplevelsystems.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | netlink: fix station_info pertid memory leak | expand |
Andy Strohman <andrew@andrewstrohman.com> writes: > 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") > Signed-off-by: Andy Strohman <andy@uplevelsystems.com> > --- > net/wireless/nl80211.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) The correct prefix should be "nl80211:".
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index fffe4b371e23..a82ecfe14d8d 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -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) ||
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") Signed-off-by: Andy Strohman <andy@uplevelsystems.com> --- net/wireless/nl80211.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)