upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 09:41:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtwn: fix mbuf allocation errors in USB RX path for > 4 KiB frames

Browse source 
We can and do receive > 4 KiB frames in the RX path (A-MSDU frames
can be up to 11KiB.)  At least one user has reported seeing this
and having it break their traffic flows.

Use m_get3() to try and grab an mbuf jumbo cluster.

This may not be the best permanent solution, but it at least will
fail for frame sizes we expect to see up and including the largest
A-MPDU frame (11Kib)  and keep a counter if it can't allocate, versus
just returning NULL because it's too large (and not keeping counters.)

Differential Revision:	https://reviews.freebsd.org/D50049
PR:	kern/286366
Reviewed by:	bz
This commit is contained in:
Adrian Chadd 2025-04-27 16:50:51 -07:00
parent 67fb9dc457
commit 28e89934a9
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sys/dev/rtwn/usb/rtwn_usb_rx.c
View file

@ -124,10 +124,15 @@ rtwn_rx_copy_to_mbuf(struct rtwn_softc *sc, struct rtwn_rx_stat_common *stat,
if (rtwn_rx_check_pre_alloc(sc, stat) != 0)
goto fail;
m = m_get2(totlen, M_NOWAIT, MT_DATA, M_PKTHDR);
/*
* Note: this can require >4 KiB (eg de-aggregating an A-MSDU
* from an USB frame. See kern/286366 for more information.
*/
m = m_get3(totlen, M_NOWAIT, MT_DATA, M_PKTHDR);
if (__predict_false(m == NULL)) {
device_printf(sc->sc_dev, "%s: could not allocate RX mbuf\n",
__func__);
device_printf(sc->sc_dev,
"%s: could not allocate RX mbuf (%d bytes)\n",
__func__, totlen);
goto fail;
}