From 7c4a6309e27f411743817fe74a832ec2d2798a4b Mon Sep 17 00:00:00 2001

From: Jakub Kicinski <kuba@kernel.org>

Date: Mon, 12 Dec 2022 19:20:37 -0800

Subject: [PATCH] ipvs: fix type warning in do_div() on 32 bit

Git-commit: 7c4a6309e27f411743817fe74a832ec2d2798a4b

Patch-mainline: v6.2-rc1

References: bsc#1207361

32 bit platforms without 64bit div generate the following warning:

net/netfilter/ipvs/ip_vs_est.c: In function 'ip_vs_est_calc_limits':

include/asm-generic/div64.h:222:35: warning: comparison of distinct pointer types lacks a cast

  222 |         (void)(((typeof((n)) *)0) == ((uint64_t *)0));  \

      |                                   ^~

net/netfilter/ipvs/ip_vs_est.c:694:17: note: in expansion of macro 'do_div'

  694 |                 do_div(val, loops);

      |                 ^~~~~~

include/asm-generic/div64.h:222:35: warning: comparison of distinct pointer types lacks a cast

  222 |         (void)(((typeof((n)) *)0) == ((uint64_t *)0));  \

      |                                   ^~

net/netfilter/ipvs/ip_vs_est.c:700:33: note: in expansion of macro 'do_div'

  700 |                                 do_div(val, min_est);

      |                                 ^~~~~~

first argument of do_div() should be unsigned. We can't just cast

as do_div() updates it as well, so we need an lval.

Make val unsigned in the first place, all paths check that the value

they assign to this variables are non-negative already.

Fixes: 705dd3444081 ("ipvs: use kthreads for stats estimation")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Link: https://lore.kernel.org/r/20221213032037.844517-1-kuba@kernel.org

Signed-off-by: Paolo Abeni <pabeni@redhat.com>

Signed-off-by: Jiri Wiesner <jwiesner@suse.de>

---

 net/netfilter/ipvs/ip_vs_est.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/netfilter/ipvs/ip_vs_est.c b/net/netfilter/ipvs/ip_vs_est.c

index df56073bb282..ce2a1549b304 100644

--- a/net/netfilter/ipvs/ip_vs_est.c

+++ b/net/netfilter/ipvs/ip_vs_est.c

@@ -640,9 +640,10 @@ static int ip_vs_est_calc_limits(struct netns_ipvs *ipvs, int *chain_max)

 	int i, loops, ntest;

 	s32 min_est = 0;

 	ktime_t t1, t2;

-	s64 diff, val;

 	int max = 8;

 	int ret = 1;

+	s64 diff;

+	u64 val;

 	INIT_HLIST_HEAD(&chain);

 	mutex_lock(&__ip_vs_mutex);

-- 

2.35.3