From: Kim Nordlund <kim.nordlund@nokia.com>
Date: Mon, 4 Dec 2006 11:44:22 +0000 (+0100)
Subject: [PKT_SCHED] act_gact: division by zero
X-Git-Tag: v2.6.16.35-rc1~16
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e6e129777f0fb6619e6a845cfd7a87b7fcd736a0;p=karo-tx-linux.git

[PKT_SCHED] act_gact: division by zero

Not returning -EINVAL, because someone might want to use the value
zero in some future gact_prob algorithm?

Signed-off-by: Kim Nordlund <kim.nordlund@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---

diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
index a1e68f78dcc2..d5571ee1369c 100644
--- a/net/sched/act_gact.c
+++ b/net/sched/act_gact.c
@@ -55,14 +55,14 @@ static DEFINE_RWLOCK(gact_lock);
 #ifdef CONFIG_GACT_PROB
 static int gact_net_rand(struct tcf_gact *p)
 {
-	if (net_random()%p->pval)
+	if (!p->pval || net_random()%p->pval)
 		return p->action;
 	return p->paction;
 }
 
 static int gact_determ(struct tcf_gact *p)
 {
-	if (p->bstats.packets%p->pval)
+	if (!p->pval || p->bstats.packets%p->pval)
 		return p->action;
 	return p->paction;
 }