cvs commit: src/sys/net if_bridge.c

[Andrew Thompson]

thompsa     2005-08-30 20:30:44 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/net              if_bridge.c 
  Log:
  MFC: if_bridge, r1.20
  
  > 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.
  
  Approved by:    re (kensmith), mlaier (mentor)
  
  Revision  Changes    Path
  1.11.2.9  +1 -0      src/sys/net/if_bridge.c