Fix a panic in softclock() if the interface is destroyed with a bpf consumer
attached. This is caused by bpf_detachd clearing IFF_PROMISC on the interface which does a SIOCSIFFLAGS ioctl. The problem here is that while the interface has been stopped, IFF_UP has not been cleared so IFF_UP != IFF_DRV_RUNNING, this causes the ioctl function to init() the interface which resets the callouts. The destroy then completes and frees the softc but softclock will panic on a dead callout pointer. Ensure ifp->if_flags matches reality by clearing IFF_UP when we destroy. Silence from: rwatson Approved by: mlaier (mentor) MFC after: 3 days
This commit is contained in:
parent
c94d6dbee5
commit
68e84b98b2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=149522
@ -492,6 +492,7 @@ bridge_clone_destroy(struct ifnet *ifp)
|
||||
BRIDGE_LOCK(sc);
|
||||
|
||||
bridge_stop(ifp, 1);
|
||||
ifp->if_flags &= ~IFF_UP;
|
||||
|
||||
while ((bif = LIST_FIRST(&sc->sc_iflist)) != NULL)
|
||||
bridge_delete_member(sc, bif);
|
||||
|
Loading…
Reference in New Issue
Block a user