1 files changed, 8 insertions, 9 deletions

diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index fad08e521c24..4a91f082a81d 100644
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@ -81,6 +81,13 @@ static void basic_put(struct tcf_proto *tp, unsigned long f)
 
 static int basic_init(struct tcf_proto *tp)
 {
+        struct basic_head *head;
+
+        head = kzalloc(sizeof(*head), GFP_KERNEL);
+        if (head == NULL)
+                return -ENOBUFS;
+        INIT_LIST_HEAD(&head->flist);
+        tp->root = head;
         return 0;
 }
 
@@ -102,6 +109,7 @@ static void basic_destroy(struct tcf_proto *tp)
                 list_del(&f->link);
                 basic_delete_filter(tp, f);
         }
+        kfree(head);
 }
 
 static int basic_delete(struct tcf_proto *tp, unsigned long arg)
@@ -176,15 +184,6 @@ static int basic_change(struct tcf_proto *tp, unsigned long base, u32 handle,
         }
 
         err = -ENOBUFS;
-        if (head == NULL) {
-                head = kzalloc(sizeof(*head), GFP_KERNEL);
-                if (head == NULL)
-                        goto errout;
-
-                INIT_LIST_HEAD(&head->flist);
-                tp->root = head;
-        }
-
         f = kzalloc(sizeof(*f), GFP_KERNEL);
         if (f == NULL)
                 goto errout;