netfilter: IDLETIMER: be syzkaller friendly

[pandora-kernel.git] / net / core / flow.c

diff --git a/net/core/flow.c b/net/core/flow.c
index 555a456..e318c7e 100644 (file)
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -358,6 +358,18 @@ void flow_cache_flush(void)
        put_online_cpus();
 }
 
+static void flow_cache_flush_task(struct work_struct *work)
+{
+       flow_cache_flush();
+}
+
+static DECLARE_WORK(flow_cache_flush_work, flow_cache_flush_task);
+
+void flow_cache_flush_deferred(void)
+{
+       schedule_work(&flow_cache_flush_work);
+}
+
 static int __cpuinit flow_cache_cpu_prepare(struct flow_cache *fc, int cpu)
 {
        struct flow_cache_percpu *fcp = per_cpu_ptr(fc->percpu, cpu);
@@ -413,7 +425,7 @@ static int __init flow_cache_init(struct flow_cache *fc)
 
        for_each_online_cpu(i) {
                if (flow_cache_cpu_prepare(fc, i))
-                       return -ENOMEM;
+                       goto err;
        }
        fc->hotcpu_notifier = (struct notifier_block){
                .notifier_call = flow_cache_cpu,
@@ -426,6 +438,18 @@ static int __init flow_cache_init(struct flow_cache *fc)
        add_timer(&fc->rnd_timer);
 
        return 0;
+
+err:
+       for_each_possible_cpu(i) {
+               struct flow_cache_percpu *fcp = per_cpu_ptr(fc->percpu, i);
+               kfree(fcp->hash_table);
+               fcp->hash_table = NULL;
+       }
+
+       free_percpu(fc->percpu);
+       fc->percpu = NULL;
+
+       return -ENOMEM;
 }
 
 static int __init flow_cache_init_global(void)