Re: gred_dump (2.4.17): bad semantic and memory leak

[jamal <hadi@xxxxxxxxxx>]

Ok, is it sch_gred day or what? ;-> Martin you had to get me out hiding,
didnt you?

I have included Alexander Atanasov fix as well:

Please look for more bugs before i submit ;->

BTW, i dont think that is a semantical problem, its just not clean so i
cleaned that too and fixed an email address i havent repsonded to for
about a year now ;->

cheers,
jamal


--- sch_gred.c  2002/01/18 23:15:56     1.1
+++ sch_gred.c  2002/01/18 23:26:46
@@ -7,7 +7,7 @@
  *              as published by the Free Software Foundation; either version
  *              2 of the License, or (at your option) any later version.
  *
- * Authors:    J Hadi Salim (hadi@xxxxxxxxxxxxxxxxxx) 1998,1999
+ * Authors:    J Hadi Salim (hadi@xxxxxxxxxx) 1998-2002
  *
  *             991129: -  Bug fix with grio mode
  *                    - a better sing. AvgQ mode with Grio(WRED)
@@ -436,7 +436,7 @@
                if (table->tab[table->def] == NULL) {
                        table->tab[table->def]=
                                kmalloc(sizeof(struct gred_sched_data), 
GFP_KERNEL);
-                       if (NULL == table->tab[ctl->DP])
+                       if (NULL == table->tab[table->def])
                                return -ENOMEM;

                        memset(table->tab[table->def], 0,
@@ -498,7 +498,7 @@
 {
        unsigned long qave;
        struct rtattr *rta;
-       struct tc_gred_qopt *opt;
+       struct tc_gred_qopt *opt = NULL ;
        struct tc_gred_qopt *dst;
        struct gred_sched *table = (struct gred_sched *)sch->data;
        struct gred_sched_data *q;
@@ -520,7 +520,7 @@

        if (!table->initd) {
                DPRINTK("NO GRED Queues setup!\n");
-               return -1;
+               goto rtattr_failure;
        }

        for (i=0;i<MAX_DPs;i++) {
@@ -577,9 +577,13 @@
        RTA_PUT(skb, TCA_GRED_PARMS, sizeof(struct tc_gred_qopt)*MAX_DPs, opt);
        rta->rta_len = skb->tail - b;

+       kfree(opt);
+
        return skb->len;

 rtattr_failure:
+       if (opt)
+               kfree(opt);
        DPRINTK("gred_dump: FAILURE!!!!\n");

 /* also free the opt struct here */