netfilter: xt_hashlimit: Fix link error in 32bit arch because of 64bit division
authorVishwanath Pai <vpai@akamai.com>
Thu, 29 Sep 2016 17:39:50 +0000 (13:39 -0400)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 30 Sep 2016 18:15:27 +0000 (20:15 +0200)
Division of 64bit integers will cause linker error undefined reference
to `__udivdi3'. Fix this by replacing divisions with div64_64

Fixes: 11d5f15723c9 ("netfilter: xt_hashlimit: Create revision 2 to ...")
Signed-off-by: Vishwanath Pai <vpai@akamai.com>
Acked-by: Maciej Żenczykowski <maze@google.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/xt_hashlimit.c

index 44a095e..2fab0c6 100644 (file)
@@ -467,17 +467,18 @@ static u64 user2credits(u64 user, int revision)
                /* If multiplying would overflow... */
                if (user > 0xFFFFFFFF / (HZ*CREDITS_PER_JIFFY_v1))
                        /* Divide first. */
-                       return (user / XT_HASHLIMIT_SCALE) *\
-                                               HZ * CREDITS_PER_JIFFY_v1;
+                       return div64_u64(user, XT_HASHLIMIT_SCALE)
+                               * HZ * CREDITS_PER_JIFFY_v1;
 
-               return (user * HZ * CREDITS_PER_JIFFY_v1) \
-                                               / XT_HASHLIMIT_SCALE;
+               return div64_u64(user * HZ * CREDITS_PER_JIFFY_v1,
+                                XT_HASHLIMIT_SCALE);
        } else {
                if (user > 0xFFFFFFFFFFFFFFFF / (HZ*CREDITS_PER_JIFFY))
-                       return (user / XT_HASHLIMIT_SCALE_v2) *\
-                                               HZ * CREDITS_PER_JIFFY;
+                       return div64_u64(user, XT_HASHLIMIT_SCALE_v2)
+                               * HZ * CREDITS_PER_JIFFY;
 
-               return (user * HZ * CREDITS_PER_JIFFY) / XT_HASHLIMIT_SCALE_v2;
+               return div64_u64(user * HZ * CREDITS_PER_JIFFY,
+                                XT_HASHLIMIT_SCALE_v2);
        }
 }