d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not skip scope zone violation check, when mbuf has M_FASTFWD_OURS flag.

Browse Source 
When mbuf has M_FASTFWD_OURS flag, this means that a destination address
is our local, but we still need to pass scope zone violation check,
because protocol level expects that IPv6 link-local addresses have
embedded scope zone indexes. This should fix the problem, when ipfw is
used to forward packets to local address and source address of a packet
is IPv6 LLA.

Reported by:	sbruno
MFC after:	3 weeks
This commit is contained in:
ae 2018-01-29 11:03:29 +00:00
parent ffc9f88671
commit 5c4c621097
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/netinet6/ip6_input.c
View File

@ -573,10 +573,8 @@ ip6_input(struct mbuf *m)
/*
* Firewall changed destination to local.
*/
m->m_flags &= ~M_FASTFWD_OURS;
ours = 1;
ip6 = mtod(m, struct ip6_hdr *);
goto hbhcheck;
goto passin;
}
/*
@ -737,10 +735,8 @@ ip6_input(struct mbuf *m)
if ((m = ip6_tryforward(m)) == NULL)
return;
if (m->m_flags & M_FASTFWD_OURS) {
m->m_flags &= ~M_FASTFWD_OURS;
ours = 1;
ip6 = mtod(m, struct ip6_hdr *);
goto hbhcheck;
goto passin;
}
}
#if defined(IPSEC) || defined(IPSEC_SUPPORT)
@ -771,13 +767,7 @@ ip6_input(struct mbuf *m)
return;
ip6 = mtod(m, struct ip6_hdr *);
srcrt = !IN6_ARE_ADDR_EQUAL(&odst, &ip6->ip6_dst);
if (m->m_flags & M_FASTFWD_OURS) {
m->m_flags &= ~M_FASTFWD_OURS;
ours = 1;
goto hbhcheck;
}
if ((m->m_flags & M_IP6_NEXTHOP) &&
if ((m->m_flags & (M_IP6_NEXTHOP | M_FASTFWD_OURS)) == M_IP6_NEXTHOP &&
m_tag_find(m, PACKET_TAG_IPFORWARD, NULL) != NULL) {
/*
* Directly ship the packet on. This allows forwarding
@ -808,6 +798,11 @@ passin:
IP6STAT_INC(ip6s_badscope);
goto bad;
}
if (m->m_flags & M_FASTFWD_OURS) {
m->m_flags &= ~M_FASTFWD_OURS;
ours = 1;
goto hbhcheck;
}
/*
* Multicast check. Assume packet is for us to avoid
* prematurely taking locks.