| From stable-bounces@linux.kernel.org Fri Dec 1 20:41:40 2006 |
| Date: Fri, 01 Dec 2006 20:36:44 -0800 (PST) |
| Message-Id: <20061201.203644.26925555.davem@davemloft.net> |
| To: stable@kernel.org |
| From: David Miller <davem@davemloft.net> |
| Cc: bunk@stusta.de |
| Subject: 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: Chris Wright <chrisw@sous-sol.org> |
| --- |
| net/sched/act_gact.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- linux-2.6.19.orig/net/sched/act_gact.c |
| +++ linux-2.6.19/net/sched/act_gact.c |
| @@ -48,14 +48,14 @@ static struct tcf_hashinfo gact_hash_inf |
| #ifdef CONFIG_GACT_PROB |
| static int gact_net_rand(struct tcf_gact *gact) |
| { |
| - if (net_random() % gact->tcfg_pval) |
| + if (!gact->tcfg_pval || net_random() % gact->tcfg_pval) |
| return gact->tcf_action; |
| return gact->tcfg_paction; |
| } |
| |
| static int gact_determ(struct tcf_gact *gact) |
| { |
| - if (gact->tcf_bstats.packets % gact->tcfg_pval) |
| + if (!gact->tcfg_pval || gact->tcf_bstats.packets % gact->tcfg_pval) |
| return gact->tcf_action; |
| return gact->tcfg_paction; |
| } |
