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

fwip(4): fixing kernel panic when receiving unicast packet

Browse Source 
Wrapping fwip_unicast_input() with NET_EPOCH_{ENTER,EXIT} to avoid a
NET_EPOCH_ASSERT() in netisr_dispatch().

Reviewed by:	hselasky
MFC after:	2 weeks
This commit is contained in:
Tai-hwa Liang 2021-04-15 14:24:14 +00:00
parent 77a84a305e
commit bdf316e892
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/firewire/if_fwip.c
View File

@ -838,6 +838,7 @@ fwip_unicast_input(struct fw_xfer *xfer)
uint64_t address;
struct mbuf *m;
struct m_tag *mtag;
struct epoch_tracker et;
struct ifnet *ifp;
struct fwip_softc *fwip;
struct fw_pkt *fp;
@ -863,6 +864,7 @@ fwip_unicast_input(struct fw_xfer *xfer)
} else {
rtcode = FWRCODE_COMPLETE;
}
NET_EPOCH_ENTER(et);
/*
* Pick up a new mbuf and stick it on the back of the receive
@ -876,7 +878,7 @@ fwip_unicast_input(struct fw_xfer *xfer)
if (rtcode != FWRCODE_COMPLETE) {
m_freem(m);
if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
return;
goto done;
}
if (bpf_peers_present(ifp->if_bpf)) {
@ -911,6 +913,8 @@ fwip_unicast_input(struct fw_xfer *xfer)
m->m_pkthdr.rcvif = ifp;
firewire_input(ifp, m, fp->mode.wreqb.src);
if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
done:
NET_EPOCH_EXIT(et);
}
static devclass_t fwip_devclass;