diff options
| author | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2014-11-27 23:06:25 +0000 |
|---|---|---|
| committer | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2014-11-27 23:06:25 +0000 |
| commit | 74860d4f7c9da9015bc49eb9c56fc0e7e739d862 (patch) | |
| tree | b985650fb7687bf95b809dfda2d768fed6e073d2 /sys/netinet6 | |
| parent | c69aeaad145a3248183b9d55482fb8d62329af6a (diff) | |
| download | src-74860d4f7c9da9015bc49eb9c56fc0e7e739d862.tar.gz src-74860d4f7c9da9015bc49eb9c56fc0e7e739d862.zip | |
Do not return unlocked/unreferenced lle in arpresolve/nd6_storelladdr -
return lle flags IFF needed.
Do not pass rte to arpresolve - pass is_gateway flag instead.
Notes
Notes:
svn path=/head/; revision=275196
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/nd6.c | 8 | ||||
| -rw-r--r-- | sys/netinet6/nd6.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index b2b615c85af4..5e1f25ff3236 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -2278,11 +2278,12 @@ nd6_rem_ifa_lle(struct in6_ifaddr *ia) */ int nd6_storelladdr(struct ifnet *ifp, struct mbuf *m, - const struct sockaddr *dst, u_char *desten, struct llentry **lle) + const struct sockaddr *dst, u_char *desten, uint32_t *pflags) { struct llentry *ln; - *lle = NULL; + if (pflags != NULL) + *pflags = 0; IF_AFDATA_UNLOCK_ASSERT(ifp); if (m != NULL && m->m_flags & M_MCAST) { int i; @@ -2334,7 +2335,8 @@ nd6_storelladdr(struct ifnet *ifp, struct mbuf *m, } bcopy(&ln->ll_addr, desten, ifp->if_addrlen); - *lle = ln; + if (pflags != NULL) + *pflags = ln->la_flags; LLE_RUNLOCK(ln); /* * A *small* use after free race exists here diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h index 358f4ecb167a..17db6183320d 100644 --- a/sys/netinet6/nd6.h +++ b/sys/netinet6/nd6.h @@ -418,7 +418,7 @@ int nd6_need_cache(struct ifnet *); int nd6_add_ifa_lle(struct in6_ifaddr *); void nd6_rem_ifa_lle(struct in6_ifaddr *); int nd6_storelladdr(struct ifnet *, struct mbuf *, - const struct sockaddr *, u_char *, struct llentry **); + const struct sockaddr *, u_char *, uint32_t *); /* nd6_nbr.c */ void nd6_na_input(struct mbuf *, int, int); |