lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETFILTER]: Fix div64_64 in ipt_connbytes

Browse Source 
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy
2005-08-13 13:57:58 -07:00
committed by David S. Miller
parent 9d810fd2d2
commit 8ffde67173
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
net/ipv4/netfilter/ipt_connbytes.c
View File

@@ -22,23 +22,19 @@ MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
MODULE_DESCRIPTION("iptables match for matching number of pkts/bytes per connection"); MODULE_DESCRIPTION("iptables match for matching number of pkts/bytes per connection");
/* 64bit divisor, dividend and result. dynamic precision */ /* 64bit divisor, dividend and result. dynamic precision */
static u_int64_t div64_64(u_int64_t divisor, u_int64_t dividend) static u_int64_t div64_64(u_int64_t dividend, u_int64_t divisor)
{ {
u_int64_t result = divisor; u_int32_t d = divisor;
if (dividend > 0xffffffff) { if (divisor > 0xffffffffULL) {
int first_bit = find_first_bit((unsigned long *) &dividend, sizeof(dividend)); unsigned int shift = fls(divisor >> 32);
/* calculate number of bits to shift. shift exactly enough
* bits to make dividend fit in 32bits. */ d = divisor >> shift;
int num_shift = (64 - 32 - first_bit); dividend >>= shift;
/* first bit has to be < 32, since dividend was > 0xffffffff */
result = result >> num_shift;
dividend = dividend >> num_shift;
} }
do_div(divisor, dividend); do_div(dividend, d);
return dividend;
return divisor;
} }
static int static int