diff options
| author | Renato Botelho <renato@netgate.com> | 2016-12-05 15:53:29 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-12-05 15:53:29 -0200 |
| commit | 812767d2bb4e201b4f826fd31924d2cafb8fe0ae (patch) | |
| tree | 3e3dbc65eb273c201d08a9eaf227f857e2a62358 /sys/netinet/in.c | |
| parent | c1d136c87f2377fd07592928003e67490eb479a6 (diff) | |
| parent | b0e9d555db88639874b99e5151bf5981a8223322 (diff) | |
| download | FreeBSD-src-812767d2bb4e201b4f826fd31924d2cafb8fe0ae.zip FreeBSD-src-812767d2bb4e201b4f826fd31924d2cafb8fe0ae.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/netinet/in.c')
| -rw-r--r-- | sys/netinet/in.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c index fde54be..e481246 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -426,6 +426,8 @@ in_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, ifa->ifa_addr = (struct sockaddr *)&ia->ia_addr; ifa->ifa_dstaddr = (struct sockaddr *)&ia->ia_dstaddr; ifa->ifa_netmask = (struct sockaddr *)&ia->ia_sockmask; + callout_init_mtx(&ia->ia_garp_timer, &ifa->ifa_mtx, + CALLOUT_RETURNUNLOCKED); ia->ia_sockmask.sin_len = 8; ia->ia_sockmask.sin_family = AF_INET; @@ -603,6 +605,10 @@ in_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, } else ifa_free(&iap->ia_ifa); + IFA_LOCK(&ia->ia_ifa); + if (callout_stop(&ia->ia_garp_timer)) + ifa_free(&ia->ia_ifa); + IFA_UNLOCK(&ia->ia_ifa); ifa_free(&ia->ia_ifa); /* in_ifaddrhead */ out: if (ia != NULL) |
