Message ID | 57f1193ae2ca44c7a901cab0b0f53d603afdca04.1464262477.git.pabeni@redhat.com |
---|---|
State | Accepted |
Delegated to: | Pablo Neira |
Headers | show |
On Thu, May 26, 2016 at 07:08:10PM +0200, Paolo Abeni wrote: > With the commit 48e8aa6e3137 ("ipv6: Set FLOWI_FLAG_KNOWN_NH at > flowi6_flags") ip6_pol_route() callers were asked to to set the > FLOWI_FLAG_KNOWN_NH properly and xt_TEE was updated accordingly, > but with the later refactor in commit bbde9fc1824a ("netfilter: > factor out packet duplication for IPv4/IPv6") the flowi6_flags > update was lost. > This commit re-add it just before the routing decision. Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv6/netfilter/nf_dup_ipv6.c b/net/ipv6/netfilter/nf_dup_ipv6.c index 6989c70..4a84b5a 100644 --- a/net/ipv6/netfilter/nf_dup_ipv6.c +++ b/net/ipv6/netfilter/nf_dup_ipv6.c @@ -33,6 +33,7 @@ static bool nf_dup_ipv6_route(struct net *net, struct sk_buff *skb, fl6.daddr = *gw; fl6.flowlabel = (__force __be32)(((iph->flow_lbl[0] & 0xF) << 16) | (iph->flow_lbl[1] << 8) | iph->flow_lbl[2]); + fl6.flowi6_flags = FLOWI_FLAG_KNOWN_NH; dst = ip6_route_output(net, NULL, &fl6); if (dst->error) { dst_release(dst);
With the commit 48e8aa6e3137 ("ipv6: Set FLOWI_FLAG_KNOWN_NH at flowi6_flags") ip6_pol_route() callers were asked to to set the FLOWI_FLAG_KNOWN_NH properly and xt_TEE was updated accordingly, but with the later refactor in commit bbde9fc1824a ("netfilter: factor out packet duplication for IPv4/IPv6") the flowi6_flags update was lost. This commit re-add it just before the routing decision. Fixes: bbde9fc1824a ("netfilter: factor out packet duplication for IPv4/IPv6") Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- net/ipv6/netfilter/nf_dup_ipv6.c | 1 + 1 file changed, 1 insertion(+)