d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix panic introduced by me in r240835, when zero weight

Browse Source 
was passed to wtab_alloc().

Reported by:	Kim Culhan <w8hdkim gmail.com>
This commit is contained in:
Gleb Smirnoff 2012-09-25 12:45:41 +00:00
parent aa91d1a85c
commit 486e090204
1 changed files with 5 additions and 4 deletions

9
sys/contrib/altq/altq/altq_red.c

@ -235,6 +235,11 @@ red_alloc(int weight, int inv_pmax, int th_min, int th_max, int flags,
if (rp == NULL)
return (NULL);
if (weight == 0)
rp->red_weight = W_WEIGHT;
else
rp->red_weight = weight;
/* allocate weight table */
rp->red_wtab = wtab_alloc(rp->red_weight);
if (rp->red_wtab == NULL) {
@ -245,10 +250,6 @@ red_alloc(int weight, int inv_pmax, int th_min, int th_max, int flags,
rp->red_avg = 0;
rp->red_idle = 1;
if (weight == 0)
rp->red_weight = W_WEIGHT;
else
rp->red_weight = weight;
if (inv_pmax == 0)
rp->red_inv_pmax = default_inv_pmax;
else