d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

if_wg: return to m_defrag() of incoming mbuf, sans leak

Browse Source 
This partially reverts df55485085 but still fixes the leak. It was
overlooked (sigh) that some packets will exceed MHLEN and cannot be
physically contiguous without clustering, but we don't actually need
it to be. m_defrag() should pull up enough for any of the headers that
we do need to be accessible.

Fixes:	df55485085
Pointy hat;	kevans
This commit is contained in:
Kyle Evans 2021-03-09 04:44:31 -06:00
parent 09673fc0f3
commit bae59285f9
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/if_wg/module/if_wg_session.c
View File

@ -1904,13 +1904,12 @@ wg_input(struct mbuf *m0, int offset, struct inpcb *inpcb,
m_adj(m0, hlen);
/*
* Ensure mbuf is contiguous over full length of the packet. This is
* done so that we can directly read the handshake values in
* wg_handshake, and so we can decrypt a transport packet by passing a
* a single buffer to noise_remote_decrypt() in wg_decap.
* Ensure mbuf has at least enough contiguous data to peel off our
* headers at the beginning.
*/
if ((m = m_pullup(m0, m0->m_pkthdr.len)) == NULL) {
if ((m = m_defrag(m0, M_NOWAIT)) == NULL) {
DPRINTF(sc, "DEFRAG fail\n");
m_freem(m0);
return;
}
data = mtod(m, void *);