Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d2fd8c5 authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by Pablo Neira Ayuso
Browse files

netfilter: ip6t_NPT: Use csum_partial() 



[ Some fixes went into mainstream before this patch, so I needed
  to rebase it upon the current tree, that's why it's different from
  the original one posted on the list --pablo ]

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1e32b0c6

net/ipv6/netfilter/ip6t_NPT.c

+3 −8
Original line number Diff line number Diff line
@@ -18,9 +18,8 @@ 
static int ip6t_npt_checkentry(const struct xt_tgchk_param *par)

{

	struct ip6t_npt_tginfo *npt = par->targinfo;

	__wsum src_sum = 0, dst_sum = 0;

	struct in6_addr pfx;

	unsigned int i;

	__wsum src_sum, dst_sum;



	if (npt->src_pfx_len > 64 || npt->dst_pfx_len > 64)

		return -EINVAL;
@@ -33,12 +32,8 @@ static int ip6t_npt_checkentry(const struct xt_tgchk_param *par) 
	if (!ipv6_addr_equal(&pfx, &npt->dst_pfx.in6))

		return -EINVAL;



	for (i = 0; i < ARRAY_SIZE(npt->src_pfx.in6.s6_addr16); i++) {

		src_sum = csum_add(src_sum,

				(__force __wsum)npt->src_pfx.in6.s6_addr16[i]);

		dst_sum = csum_add(dst_sum,

				(__force __wsum)npt->dst_pfx.in6.s6_addr16[i]);

	}

	src_sum = csum_partial(&npt->src_pfx.in6, sizeof(npt->src_pfx.in6), 0);

	dst_sum = csum_partial(&npt->dst_pfx.in6, sizeof(npt->dst_pfx.in6), 0);



	npt->adjustment = ~csum_fold(csum_sub(src_sum, dst_sum));

	return 0;