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

vnic: apply BPF tap before passing packet to hardware

Browse Source 
Previously we passed tx packets to hardware via nicvf_tx_mbuf_locked
and then to the BPF tap, with a possibly invalid mbuf which would result
in a panic.

PR:		223600
Discussed with:	bz
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation, Packet.net (hardware)
This commit is contained in:
Ed Maste 2017-11-10 22:17:30 +00:00
parent 6555da9c5b
commit 2dc620ac83
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/vnic/nicvf_queues.c
View File

@ -992,6 +992,9 @@ nicvf_xmit_locked(struct snd_queue *sq)
err = 0;
while ((next = drbr_peek(ifp, sq->br)) != NULL) {
/* Send a copy of the frame to the BPF listener */
ETHER_BPF_MTAP(ifp, next);
err = nicvf_tx_mbuf_locked(sq, &next);
if (err != 0) {
if (next == NULL)
@ -1002,8 +1005,6 @@ nicvf_xmit_locked(struct snd_queue *sq)
break;
}
drbr_advance(ifp, sq->br);
/* Send a copy of the frame to the BPF listener */
ETHER_BPF_MTAP(ifp, next);
}
return (err);
}