Module Name: src Committed By: martin Date: Mon Feb 26 13:36:01 UTC 2018
Modified Files: src/sys/netinet [netbsd-8]: if_arp.c src/sys/netinet6 [netbsd-8]: nd6_nbr.c Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #589): sys/netinet/if_arp.c: revision 1.267 sys/netinet6/nd6_nbr.c: revision 1.146-1.148 Use KASSERT for checking a programming error Simplify; pass dp to nd6_dad_duplicated instead of looking it up again in it Avoid a race condition of DAD timer destructions When we see dp->dad_ifa == NULL, it means that the ifa is being deleted and also the callout is scheduled again by someone. We shouldn't rely on a result of callout_pending to know if the callout is scheduled because it returns false if the subsequent callout handler is already on the fly. We have to always delegate the destruction of dp to the subsequent handler unconditionally if dp->dad_ifa == NULL. Otherwise, the first handler destroys the dp and the second handler tries to handle destroyed dp. To generate a diff of this commit: cvs rdiff -u -r1.250.2.5 -r1.250.2.6 src/sys/netinet/if_arp.c cvs rdiff -u -r1.138.6.3 -r1.138.6.4 src/sys/netinet6/nd6_nbr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.