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

debugnet: fix an errant assertion

Browse Source 
We may call debugnet_free() before g_debugnet_pcb_inuse is true,
specifically in the cases where the interface is down or does not
support debugnet. pcb->dp_drv_input is used to hold the real driver
if_input callback while debugnet is in use, so we can check the status
of this field in the assertion.

This can be triggered trivially by trying to configure netdump on an
unsupported interface at the ddb prompt.

Initializing the dp_drv_input field to NULL explicitly is not necessary
but helps display the intent.

PR:		263929
Reported by:	Martin Filla <freebsd@sysctl.cz>
Reviewed by:	cem, markj
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D35179
This commit is contained in:
Mitchell Horne 2022-05-14 10:23:08 -03:00
parent 14c99b43ef
commit a84bf5eaa1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/net/debugnet.c
View File

@ -605,8 +605,8 @@ debugnet_free(struct debugnet_pcb *pcb)
{
struct ifnet *ifp;
MPASS(g_debugnet_pcb_inuse);
MPASS(pcb == &g_dnet_pcb);
MPASS(pcb->dp_drv_input == NULL || g_debugnet_pcb_inuse);
ifp = pcb->dp_ifp;
if (ifp != NULL) {
@ -646,6 +646,7 @@ debugnet_connect(const struct debugnet_conn_params *dcp,
.dp_seqno = 1,
.dp_ifp = dcp->dc_ifp,
.dp_rx_handler = dcp->dc_rx_handler,
.dp_drv_input = NULL,
};
/* Switch to the debugnet mbuf zones. */