/*
- * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2018 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
#include <sys/malloc.h>
+#include <kern/locks.h>
+
#include <net/if.h>
#include <net/route.h>
#include <net/if_types.h>
#include <security/mac_framework.h>
#endif
-#define IN6_IS_ADDR_6TO4(x) (ntohs((x)->s6_addr16[0]) == 0x2002)
-#define GET_V4(x) ((const struct in_addr *)(&(x)->s6_addr16[1]))
+#define GET_V4(x) ((const struct in_addr *)(const void *)(&(x)->s6_addr16[1]))
+
+static lck_grp_t *stf_mtx_grp;
struct stf_softc {
ifnet_t sc_if; /* common area */
struct route_in6 __sc_ro6; /* just for safety */
} __sc_ro46;
#define sc_ro __sc_ro46.__sc_ro4
+ decl_lck_mtx_data(, sc_ro_mtx);
const struct encaptab *encap_cookie;
bpf_tap_mode tap_mode;
bpf_packet_func tap_callback;
void stfattach (void);
static int ip_stf_ttl = 40;
+static int stf_init_done;
static void in_stf_input(struct mbuf *, int);
-extern struct domain inetdomain;
-struct protosw in_stf_protosw =
-{ SOCK_RAW, &inetdomain, IPPROTO_IPV6, PR_ATOMIC|PR_ADDR,
- in_stf_input, NULL, NULL, rip_ctloutput,
- NULL,
- NULL, NULL, NULL, NULL,
- NULL,
- &rip_usrreqs,
- NULL, rip_unlock, NULL, {NULL, NULL}, NULL, {0}
+static void stfinit(void);
+
+static struct protosw in_stf_protosw =
+{
+ .pr_type = SOCK_RAW,
+ .pr_protocol = IPPROTO_IPV6,
+ .pr_flags = PR_ATOMIC|PR_ADDR,
+ .pr_input = in_stf_input,
+ .pr_ctloutput = rip_ctloutput,
+ .pr_usrreqs = &rip_usrreqs,
+ .pr_unlock = rip_unlock,
};
static int stf_encapcheck(const struct mbuf *, int, int, void *);
static errno_t stf_ioctl(ifnet_t ifp, u_long cmd, void *data);
static errno_t stf_output(ifnet_t ifp, mbuf_t m);
+static void
+stfinit(void)
+{
+ if (!stf_init_done) {
+ stf_mtx_grp = lck_grp_alloc_init("stf", LCK_GRP_ATTR_NULL);
+ stf_init_done = 1;
+ }
+}
+
/*
* gif_input is the input handler for IP and IPv6 attached to gif
*/
mbuf_t m,
__unused char *frame_header)
{
- proto_input(protocol_family, m);
+ if (proto_input(protocol_family, m) != 0)
+ m_freem(m);
return (0);
}
struct stf_softc *sc;
int error;
const struct encaptab *p;
- struct ifnet_init_params stf_init;
+ struct ifnet_init_eparams stf_init;
+
+ stfinit();
error = proto_register_plumber(PF_INET6, APPLE_IF_FAM_STF,
- stf_attach_inet6, NULL);
+ stf_attach_inet6, NULL);
if (error != 0)
printf("proto_register_plumber failed for AF_INET6 error=%d\n", error);
- sc = _MALLOC(sizeof(struct stf_softc), M_DEVBUF, M_WAITOK);
+ sc = _MALLOC(sizeof(struct stf_softc), M_DEVBUF, M_WAITOK | M_ZERO);
if (sc == 0) {
printf("stf softc attach failed\n" );
return;
}
- bzero(sc, sizeof(*sc));
-
p = encap_attach_func(AF_INET, IPPROTO_IPV6, stf_encapcheck,
&in_stf_protosw, sc);
if (p == NULL) {
return;
}
sc->encap_cookie = p;
+ lck_mtx_init(&sc->sc_ro_mtx, stf_mtx_grp, LCK_ATTR_NULL);
bzero(&stf_init, sizeof(stf_init));
+ stf_init.ver = IFNET_INIT_CURRENT_VERSION;
+ stf_init.len = sizeof (stf_init);
+ stf_init.flags = IFNET_INIT_LEGACY;
stf_init.name = "stf";
stf_init.unit = 0;
stf_init.type = IFT_STF;
stf_init.ioctl = stf_ioctl;
stf_init.set_bpf_tap = stf_set_bpf_tap;
- error = ifnet_allocate(&stf_init, &sc->sc_if);
+ error = ifnet_allocate_extended(&stf_init, &sc->sc_if);
if (error != 0) {
printf("stfattach, ifnet_allocate failed - %d\n", error);
encap_detach(sc->encap_cookie);
+ lck_mtx_destroy(&sc->sc_ro_mtx, stf_mtx_grp);
FREE(sc, M_DEVBUF);
return;
}
printf("stfattach: ifnet_attach returned error=%d\n", error);
encap_detach(sc->encap_cookie);
ifnet_release(sc->sc_if);
+ lck_mtx_destroy(&sc->sc_ro_mtx, stf_mtx_grp);
FREE(sc, M_DEVBUF);
return;
}
* local 6to4 address.
* success on: dst = 10.1.1.1, ia6->ia_addr = 2002:0a01:0101:...
*/
+ IFA_LOCK(&ia6->ia_ifa);
if (bcmp(GET_V4(&ia6->ia_addr.sin6_addr), &ip.ip_dst,
sizeof(ip.ip_dst)) != 0) {
- ifafree(&ia6->ia_ifa);
+ IFA_UNLOCK(&ia6->ia_ifa);
+ IFA_REMREF(&ia6->ia_ifa);
return 0;
}
/*
b = ip.ip_src;
b.s_addr &= GET_V4(&ia6->ia_prefixmask.sin6_addr)->s_addr;
if (a.s_addr != b.s_addr) {
- ifafree(&ia6->ia_ifa);
+ IFA_UNLOCK(&ia6->ia_ifa);
+ IFA_REMREF(&ia6->ia_ifa);
return 0;
}
/* stf interface makes single side match only */
- ifafree(&ia6->ia_ifa);
+ IFA_UNLOCK(&ia6->ia_ifa);
+ IFA_REMREF(&ia6->ia_ifa);
return 32;
}
struct in_addr in;
ifnet_lock_shared(ifp);
- for (ia = ifp->if_addrlist.tqh_first;
- ia;
- ia = ia->ifa_list.tqe_next)
- {
- if (ia->ifa_addr == NULL)
+ for (ia = ifp->if_addrlist.tqh_first; ia; ia = ia->ifa_list.tqe_next) {
+ IFA_LOCK(ia);
+ if (ia->ifa_addr == NULL) {
+ IFA_UNLOCK(ia);
continue;
- if (ia->ifa_addr->sa_family != AF_INET6)
+ }
+ if (ia->ifa_addr->sa_family != AF_INET6) {
+ IFA_UNLOCK(ia);
continue;
- sin6 = (struct sockaddr_in6 *)ia->ifa_addr;
- if (!IN6_IS_ADDR_6TO4(&sin6->sin6_addr))
+ }
+ sin6 = (struct sockaddr_in6 *)(void *)ia->ifa_addr;
+ if (!IN6_IS_ADDR_6TO4(&sin6->sin6_addr)) {
+ IFA_UNLOCK(ia);
continue;
-
+ }
bcopy(GET_V4(&sin6->sin6_addr), &in, sizeof(in));
+ IFA_UNLOCK(ia);
lck_rw_lock_shared(in_ifaddr_rwlock);
for (ia4 = TAILQ_FIRST(&in_ifaddrhead);
ia4;
ia4 = TAILQ_NEXT(ia4, ia_link))
{
- if (ia4->ia_addr.sin_addr.s_addr == in.s_addr)
+ IFA_LOCK(&ia4->ia_ifa);
+ if (ia4->ia_addr.sin_addr.s_addr == in.s_addr) {
+ IFA_UNLOCK(&ia4->ia_ifa);
break;
+ }
+ IFA_UNLOCK(&ia4->ia_ifa);
}
lck_rw_done(in_ifaddr_rwlock);
if (ia4 == NULL)
continue;
- ifaref(ia);
+ IFA_ADDREF(ia); /* for caller */
ifnet_lock_done(ifp);
- return (struct in6_ifaddr *)ia;
+ return ((struct in6_ifaddr *)ia);
}
ifnet_lock_done(ifp);
- return NULL;
+ return (NULL);
}
int
struct ip6_hdr *ip6;
struct in6_ifaddr *ia6;
struct sockaddr_in *dst4;
- errno_t result = 0;
+ struct ip_out_args ipoa;
+ errno_t result = 0;
+
+ bzero(&ipoa, sizeof(ipoa));
+ ipoa.ipoa_boundif = IFSCOPE_NONE;
+ ipoa.ipoa_flags = IPOAF_SELECT_SRCIF;
+ ipoa.ipoa_sotc = SO_TC_UNSPEC;
+ ipoa.ipoa_netsvctype = _NET_SERVICE_TYPE_UNSPEC;
sc = ifnet_softc(ifp);
- dst6 = (const struct sockaddr_in6 *)dst;
+ dst6 = (const struct sockaddr_in6 *)(const void *)dst;
/* just in case */
if ((ifnet_flags(ifp) & IFF_UP) == 0) {
m = m_pullup(m, sizeof(*ip6));
if (!m) {
*m0 = NULL; /* makes sure this won't be double freed */
- ifafree(&ia6->ia_ifa);
+ IFA_REMREF(&ia6->ia_ifa);
return ENOBUFS;
}
}
else if (IN6_IS_ADDR_6TO4(&dst6->sin6_addr))
in4 = GET_V4(&dst6->sin6_addr);
else {
- ifafree(&ia6->ia_ifa);
+ IFA_REMREF(&ia6->ia_ifa);
return ENETUNREACH;
}
bpf_tap_out(ifp, 0, m, &af, sizeof(af));
}
- M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
+ M_PREPEND(m, sizeof(struct ip), M_DONTWAIT, 1);
if (m && mbuf_len(m) < sizeof(struct ip))
m = m_pullup(m, sizeof(struct ip));
if (m == NULL) {
*m0 = NULL;
- ifafree(&ia6->ia_ifa);
+ IFA_REMREF(&ia6->ia_ifa);
return ENOBUFS;
}
ip = mtod(m, struct ip *);
bzero(ip, sizeof(*ip));
+ IFA_LOCK_SPIN(&ia6->ia_ifa);
bcopy(GET_V4(&((struct sockaddr_in6 *)&ia6->ia_addr)->sin6_addr),
&ip->ip_src, sizeof(ip->ip_src));
+ IFA_UNLOCK(&ia6->ia_ifa);
bcopy(in4, &ip->ip_dst, sizeof(ip->ip_dst));
ip->ip_p = IPPROTO_IPV6;
ip->ip_ttl = ip_stf_ttl;
ip->ip_len = m->m_pkthdr.len; /*host order*/
if (ifp->if_flags & IFF_LINK1)
- ip_ecn_ingress(ECN_ALLOWED, &ip->ip_tos, &tos);
+ ip_ecn_ingress(ECN_NORMAL, &ip->ip_tos, &tos);
else
ip_ecn_ingress(ECN_NOCARE, &ip->ip_tos, &tos);
- dst4 = (struct sockaddr_in *)&sc->sc_ro.ro_dst;
- if (dst4->sin_family != AF_INET ||
+ lck_mtx_lock(&sc->sc_ro_mtx);
+ dst4 = (struct sockaddr_in *)(void *)&sc->sc_ro.ro_dst;
+ if (ROUTE_UNUSABLE(&sc->sc_ro) || dst4->sin_family != AF_INET ||
bcmp(&dst4->sin_addr, &ip->ip_dst, sizeof(ip->ip_dst)) != 0) {
- /* cache route doesn't match */
- printf("stf_output: cached route doesn't match \n");
+ ROUTE_RELEASE(&sc->sc_ro);
+ /* cache route doesn't match: always the case during the first use */
dst4->sin_family = AF_INET;
dst4->sin_len = sizeof(struct sockaddr_in);
bcopy(&ip->ip_dst, &dst4->sin_addr, sizeof(dst4->sin_addr));
- if (sc->sc_ro.ro_rt) {
- rtfree(sc->sc_ro.ro_rt);
- sc->sc_ro.ro_rt = NULL;
- }
}
- if (sc->sc_ro.ro_rt == NULL) {
- rtalloc(&sc->sc_ro);
- if (sc->sc_ro.ro_rt == NULL) {
- ifafree(&ia6->ia_ifa);
- return ENETUNREACH;
- }
- }
+ result = ip_output(m, NULL, &sc->sc_ro, IP_OUTARGS, NULL, &ipoa);
+ lck_mtx_unlock(&sc->sc_ro_mtx);
- result = ip_output_list(m, 0, NULL, &sc->sc_ro, 0, NULL, NULL);
/* Assumption: ip_output will free mbuf on errors */
/* All the output processing is done here, don't let stf_output be called */
if (result == 0)
result = EJUSTRETURN;
*m0 = NULL;
- ifafree(&ia6->ia_ifa);
+ IFA_REMREF(&ia6->ia_ifa);
return result;
}
static errno_t
ia4;
ia4 = TAILQ_NEXT(ia4, ia_link))
{
- if ((ia4->ia_ifa.ifa_ifp->if_flags & IFF_BROADCAST) == 0)
+ IFA_LOCK(&ia4->ia_ifa);
+ if ((ia4->ia_ifa.ifa_ifp->if_flags & IFF_BROADCAST) == 0) {
+ IFA_UNLOCK(&ia4->ia_ifa);
continue;
+ }
if (in->s_addr == ia4->ia_broadaddr.sin_addr.s_addr) {
+ IFA_UNLOCK(&ia4->ia_ifa);
lck_rw_done(in_ifaddr_rwlock);
return -1;
}
+ IFA_UNLOCK(&ia4->ia_ifa);
}
lck_rw_done(in_ifaddr_rwlock);
itos = (ntohl(ip6.ip6_flow) >> 20) & 0xff;
if ((ifnet_flags(ifp) & IFF_LINK1) != 0)
- ip_ecn_egress(ECN_ALLOWED, &otos, &itos);
+ ip_ecn_egress(ECN_NORMAL, &otos, &itos);
else
ip_ecn_egress(ECN_NOCARE, &otos, &itos);
ip6.ip6_flow &= ~htonl(0xff << 20);
switch (cmd) {
case SIOCSIFADDR:
ifa = (struct ifaddr *)data;
- if (ifa == NULL || ifa->ifa_addr->sa_family != AF_INET6) {
+ if (ifa == NULL) {
+ error = EAFNOSUPPORT;
+ break;
+ }
+ IFA_LOCK(ifa);
+ if (ifa->ifa_addr->sa_family != AF_INET6) {
+ IFA_UNLOCK(ifa);
error = EAFNOSUPPORT;
break;
}
- sin6 = (struct sockaddr_in6 *)ifa->ifa_addr;
+ sin6 = (struct sockaddr_in6 *)(void *)ifa->ifa_addr;
if (IN6_IS_ADDR_6TO4(&sin6->sin6_addr)) {
if ( !(ifnet_flags( ifp ) & IFF_UP) ) {
/* do this only if the interface is not already up */
ifa->ifa_rtrequest = stf_rtrequest;
+ IFA_UNLOCK(ifa);
ifnet_set_flags(ifp, IFF_UP, IFF_UP);
+ } else {
+ IFA_UNLOCK(ifa);
}
- } else
+ } else {
+ IFA_UNLOCK(ifa);
error = EINVAL;
+ }
+ IFA_LOCK_ASSERT_NOTHELD(ifa);
break;
case SIOCADDMULTI:
break;
default:
- error = EINVAL;
+ error = EOPNOTSUPP;
break;
}
projects / apple / xnu.git / blobdiff