diff options
| author | rwatson <rwatson@FreeBSD.org> | 2009-06-21 20:08:07 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2009-06-21 20:08:07 +0000 |
| commit | b5481f96fb5b0f8821f819dbae822c405e250cd2 (patch) | |
| tree | 3450dc220415e4efa41a24be9dd8733a03fcb534 /sys/netipx | |
| parent | 1f7e54e8c51edb13935d195e0c1f2ec68c672794 (diff) | |
| download | FreeBSD-src-b5481f96fb5b0f8821f819dbae822c405e250cd2.zip FreeBSD-src-b5481f96fb5b0f8821f819dbae822c405e250cd2.tar.gz | |
In ipx_control(), lock if_addr_mtx when adding/removing addresses from
interface address lists, and don't add an address until it's fully
initialized.
MFC after: 3 weeks
Diffstat (limited to 'sys/netipx')
| -rw-r--r-- | sys/netipx/ipx.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c index 3aa84e3..cd2240f 100644 --- a/sys/netipx/ipx.c +++ b/sys/netipx/ipx.c @@ -171,12 +171,9 @@ ipx_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, ia = oia; ifa = (struct ifaddr *)ia; ifa_init(ifa); - TAILQ_INSERT_TAIL(&ifp->if_addrhead, ifa, ifa_link); ia->ia_ifp = ifp; ifa->ifa_addr = (struct sockaddr *)&ia->ia_addr; - ifa->ifa_netmask = (struct sockaddr *)&ipx_netmask; - ifa->ifa_dstaddr = (struct sockaddr *)&ia->ia_dstaddr; if (ifp->if_flags & IFF_BROADCAST) { ia->ia_broadaddr.sipx_family = AF_IPX; @@ -185,6 +182,9 @@ ipx_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, ia->ia_broadaddr.sipx_addr.x_host = ipx_broadhost; } + IF_ADDR_LOCK(ifp); + TAILQ_INSERT_TAIL(&ifp->if_addrhead, ifa, ifa_link); + IF_ADDR_UNLOCK(ifp); } break; @@ -217,7 +217,9 @@ ipx_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, case SIOCDIFADDR: ipx_ifscrub(ifp, ia); ifa = (struct ifaddr *)ia; + IF_ADDR_LOCK(ifp); TAILQ_REMOVE(&ifp->if_addrhead, ifa, ifa_link); + IF_ADDR_UNLOCK(ifp); oia = ia; if (oia == (ia = ipx_ifaddr)) { ipx_ifaddr = ia->ia_next; |
