UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

netfilter: ip6t_NPT: Fix adjustment calculation 

Cast __wsum from/to __sum16 is wrong.  Instead, apply appropriate
conversion function: csum_unfold() or csum_fold().

[ The original patch has been modified to undo the final ~ that
  csum_fold returns. We only need to fold the 32-bit word that
  results from the checksum calculation into a 16-bit to ensure
  that the original subnet is restored appropriately. Spotted by
  Ulrich Weber. ]

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
YOSHIFUJI Hideaki / 吉藤英明 2013-01-26 08:37:48 +00:00 committed by Pablo Neira Ayuso
parent 4b47bc9a9e
commit f5271fff56
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv6/netfilter/ip6t_NPT.c
View File

@ -30,7 +30,7 @@ static int ip6t_npt_checkentry(const struct xt_tgchk_param *par)
(__force __wsum)npt->dst_pfx.in6.s6_addr16[i]); (__force __wsum)npt->dst_pfx.in6.s6_addr16[i]);
} }
npt->adjustment = (__force __sum16) csum_sub(src_sum, dst_sum); npt->adjustment = ~csum_fold(csum_sub(src_sum, dst_sum));
return 0; return 0;
} }
@ -66,8 +66,8 @@ static bool ip6t_npt_map_pfx(const struct ip6t_npt_tginfo *npt,
return false; return false;
} }
sum = (__force __sum16) csum_add((__force __wsum)addr->s6_addr16[idx], sum = ~csum_fold(csum_add(csum_unfold((__force __sum16)addr->s6_addr16[idx]),
npt->adjustment); csum_unfold(npt->adjustment)));
if (sum == CSUM_MANGLED_0) if (sum == CSUM_MANGLED_0)
sum = 0; sum = 0;
*(__force __sum16 *)&addr->s6_addr16[idx] = sum; *(__force __sum16 *)&addr->s6_addr16[idx] = sum;