diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-26 12:23:56 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-26 12:23:56 +0000 |
commit | 009e36806b89a29141dbe28b170117f5330b06da (patch) | |
tree | 690a5c5296e4999e22f7552b97290717de7405a8 /target/linux/generic/patches-3.6/611-netfilter_match_bypass_default_table.patch | |
parent | e7ece301fea27f5ff8977d61aa914e31ff299b07 (diff) | |
download | upstream-009e36806b89a29141dbe28b170117f5330b06da.tar.gz upstream-009e36806b89a29141dbe28b170117f5330b06da.tar.bz2 upstream-009e36806b89a29141dbe28b170117f5330b06da.zip |
kernel: remove kernel 3.6
kernel 3.6 is not used by any target any more, remove it.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 41834
Diffstat (limited to 'target/linux/generic/patches-3.6/611-netfilter_match_bypass_default_table.patch')
-rw-r--r-- | target/linux/generic/patches-3.6/611-netfilter_match_bypass_default_table.patch | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/target/linux/generic/patches-3.6/611-netfilter_match_bypass_default_table.patch b/target/linux/generic/patches-3.6/611-netfilter_match_bypass_default_table.patch deleted file mode 100644 index 10f9250bb2..0000000000 --- a/target/linux/generic/patches-3.6/611-netfilter_match_bypass_default_table.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- a/net/ipv4/netfilter/ip_tables.c -+++ b/net/ipv4/netfilter/ip_tables.c -@@ -309,6 +309,33 @@ struct ipt_entry *ipt_next_entry(const s - return (void *)entry + entry->next_offset; - } - -+static bool -+ipt_handle_default_rule(struct ipt_entry *e, unsigned int *verdict) -+{ -+ struct xt_entry_target *t; -+ struct xt_standard_target *st; -+ -+ if (e->target_offset != sizeof(struct ipt_entry)) -+ return false; -+ -+ if (!(e->ip.flags & IPT_F_NO_DEF_MATCH)) -+ return false; -+ -+ t = ipt_get_target(e); -+ if (t->u.kernel.target->target) -+ return false; -+ -+ st = (struct xt_standard_target *) t; -+ if (st->verdict == XT_RETURN) -+ return false; -+ -+ if (st->verdict >= 0) -+ return false; -+ -+ *verdict = (unsigned)(-st->verdict) - 1; -+ return true; -+} -+ - /* Returns one of the generic firewall policies, like NF_ACCEPT. */ - unsigned int - ipt_do_table(struct sk_buff *skb, -@@ -333,6 +360,25 @@ ipt_do_table(struct sk_buff *skb, - ip = ip_hdr(skb); - indev = in ? in->name : nulldevname; - outdev = out ? out->name : nulldevname; -+ -+ IP_NF_ASSERT(table->valid_hooks & (1 << hook)); -+ local_bh_disable(); -+ addend = xt_write_recseq_begin(); -+ private = table->private; -+ cpu = smp_processor_id(); -+ table_base = private->entries[cpu]; -+ jumpstack = (struct ipt_entry **)private->jumpstack[cpu]; -+ stackptr = per_cpu_ptr(private->stackptr, cpu); -+ origptr = *stackptr; -+ -+ e = get_entry(table_base, private->hook_entry[hook]); -+ if (ipt_handle_default_rule(e, &verdict)) { -+ ADD_COUNTER(e->counters, skb->len, 1); -+ xt_write_recseq_end(addend); -+ local_bh_enable(); -+ return verdict; -+ } -+ - /* We handle fragments by dealing with the first fragment as - * if it was a normal packet. All other fragments are treated - * normally, except that they will NEVER match rules that ask -@@ -347,18 +393,6 @@ ipt_do_table(struct sk_buff *skb, - acpar.family = NFPROTO_IPV4; - acpar.hooknum = hook; - -- IP_NF_ASSERT(table->valid_hooks & (1 << hook)); -- local_bh_disable(); -- addend = xt_write_recseq_begin(); -- private = table->private; -- cpu = smp_processor_id(); -- table_base = private->entries[cpu]; -- jumpstack = (struct ipt_entry **)private->jumpstack[cpu]; -- stackptr = per_cpu_ptr(private->stackptr, cpu); -- origptr = *stackptr; -- -- e = get_entry(table_base, private->hook_entry[hook]); -- - pr_debug("Entering %s(hook %u); sp at %u (UF %p)\n", - table->name, hook, origptr, - get_entry(table_base, private->underflow[hook])); |