diff options
Diffstat (limited to 'main/linux-grsec/0001-grsec-revert-conflicting-flow-cache-changes.patch')
-rw-r--r-- | main/linux-grsec/0001-grsec-revert-conflicting-flow-cache-changes.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/main/linux-grsec/0001-grsec-revert-conflicting-flow-cache-changes.patch b/main/linux-grsec/0001-grsec-revert-conflicting-flow-cache-changes.patch new file mode 100644 index 000000000..99571657b --- /dev/null +++ b/main/linux-grsec/0001-grsec-revert-conflicting-flow-cache-changes.patch @@ -0,0 +1,43 @@ +From 5ea3677e1f26dd343ed139d2bdad23ae2f1393db Mon Sep 17 00:00:00 2001 +From: Timo Teras <timo.teras@iki.fi> +Date: Mon, 12 Apr 2010 13:43:01 +0000 +Subject: [PATCH 01/18] grsec: revert conflicting flow cache changes + +--- + net/core/flow.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/net/core/flow.c b/net/core/flow.c +index 5b27992..9601587 100644 +--- a/net/core/flow.c ++++ b/net/core/flow.c +@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(0); + + static u32 flow_hash_shift; + #define flow_hash_size (1 << flow_hash_shift) +-static DEFINE_PER_CPU(struct flow_cache_entry **, flow_tables); ++static DEFINE_PER_CPU(struct flow_cache_entry **, flow_tables) = { NULL }; + + #define flow_table(cpu) (per_cpu(flow_tables, cpu)) + +@@ -52,7 +52,7 @@ struct flow_percpu_info { + u32 hash_rnd; + int count; + }; +-static DEFINE_PER_CPU(struct flow_percpu_info, flow_hash_info); ++static DEFINE_PER_CPU(struct flow_percpu_info, flow_hash_info) = { 0 }; + + #define flow_hash_rnd_recalc(cpu) \ + (per_cpu(flow_hash_info, cpu).hash_rnd_recalc) +@@ -69,7 +69,7 @@ struct flow_flush_info { + atomic_t cpuleft; + struct completion completion; + }; +-static DEFINE_PER_CPU(struct tasklet_struct, flow_flush_tasklets); ++static DEFINE_PER_CPU(struct tasklet_struct, flow_flush_tasklets) = { NULL }; + + #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) + +-- +1.7.0.2 + |