From: YOSHIFUJI Hideaki / 吉藤英明 Date: Sat, 26 Jan 2013 08:38:44 +0000 (+0000) Subject: netfilter: ip6t_NPT: Fix prefix mangling X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d4c38fa87d2b05be5daafb6a92b6ad15b66da8cb;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git netfilter: ip6t_NPT: Fix prefix mangling Make sure only the bits that are part of the prefix are mangled. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: Pablo Neira Ayuso --- diff --git a/net/ipv6/netfilter/ip6t_NPT.c b/net/ipv6/netfilter/ip6t_NPT.c index 68788c84aee7..87b759c11da5 100644 --- a/net/ipv6/netfilter/ip6t_NPT.c +++ b/net/ipv6/netfilter/ip6t_NPT.c @@ -51,7 +51,7 @@ static bool ip6t_npt_map_pfx(const struct ip6t_npt_tginfo *npt, idx = i / 32; addr->s6_addr32[idx] &= mask; - addr->s6_addr32[idx] |= npt->dst_pfx.in6.s6_addr32[idx]; + addr->s6_addr32[idx] |= ~mask & npt->dst_pfx.in6.s6_addr32[idx]; } if (pfx_len <= 48)