kernel: pick earlycon regression fixes from the stable-queue.git

[oweals/openwrt.git] / target / linux / generic / pending-3.18 / 610-netfilter_match_bypass_default_checks.patch

diff --git a/target/linux/generic/pending-3.18/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/pending-3.18/610-netfilter_match_bypass_default_checks.patch
index e5c7a77b46f21eec882384a38737d1040d662b27..b96402fd3ed1c7fcc489d8ba0bed92957be7e643 100644 (file)
--- a/target/linux/generic/pending-3.18/610-netfilter_match_bypass_default_checks.patch
+++ b/target/linux/generic/pending-3.18/610-netfilter_match_bypass_default_checks.patch
@@ -57,9 +57,9 @@
 +      ip_checkdefault(&e->ip);
 +
        j = 0;
+       memset(&mtpar, 0, sizeof(mtpar));
        mtpar.net       = net;
-       mtpar.table     = name;
-@@ -942,6 +970,7 @@ copy_entries_to_user(unsigned int total_
+@@ -943,6 +971,7 @@ copy_entries_to_user(unsigned int total_
        const struct xt_table_info *private = table->private;
        int ret = 0;
        const void *loc_cpu_entry;
@@ -67,7 +67,7 @@
  
        counters = alloc_counters(table);
        if (IS_ERR(counters))
-@@ -973,6 +1002,14 @@ copy_entries_to_user(unsigned int total_
+@@ -974,6 +1003,14 @@ copy_entries_to_user(unsigned int total_
                        goto free_counters;
                }
  
@@ -82,7 +82,7 @@
                for (i = sizeof(struct ipt_entry);
                     i < e->target_offset;
                     i += m->u.match_size) {
-@@ -1379,12 +1416,15 @@ compat_copy_entry_to_user(struct ipt_ent
+@@ -1380,12 +1417,15 @@ compat_copy_entry_to_user(struct ipt_ent
        compat_uint_t origsize;
        const struct xt_entry_match *ematch;
        int ret = 0;