Date: Wed, 8 Jun 2022 17:07:09 GMT From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: b84aea440bf8 - stable/13 - LinuxKPI: 802.11 plug mbuf leak in error cases Message-ID: <202206081707.258H79DN089027@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b84aea440bf8a4bd6b0899ad9b3303c80cf4d971 commit b84aea440bf8a4bd6b0899ad9b3303c80cf4d971 Author: Bjoern A. Zeeb <bz@FreeBSD.org> AuthorDate: 2022-06-05 18:04:57 +0000 Commit: Bjoern A. Zeeb <bz@FreeBSD.org> CommitDate: 2022-06-08 16:11:19 +0000 LinuxKPI: 802.11 plug mbuf leak in error cases Manually free the mbuf in certain error cases from net80211 to not leak it. Note that the differences between ieee80211_input_mimo() and ieee80211_input_mimo_all(), the former not consuming the mbuf while the later does, is confusing. Sponsored by: The FreeBSD Foundation (cherry picked from commit dbc06dd98ae9940377a9ef31a594c17566334977) --- sys/compat/linuxkpi/common/src/linux_80211.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 27141829839f..82467d932054 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3870,6 +3870,7 @@ no_trace_beacons: ok = ieee80211_add_rx_params(m, &rx_stats); if (ok == 0) { + m_freem(m); counter_u64_add(ic->ic_ierrors, 1); goto err; } @@ -3960,8 +3961,11 @@ skip_device_ts: if (ni != NULL) { ok = ieee80211_input_mimo(ni, m); ieee80211_free_node(ni); + if (ok < 0) + m_freem(m); } else { ok = ieee80211_input_mimo_all(ic, m); + /* mbuf got consumed. */ } NET_EPOCH_EXIT(et);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206081707.258H79DN089027>