kernel: update to linux 3.10.4, refresh patches

[openwrt.git] / target / linux / generic / patches-3.10 / 610-netfilter_match_bypass_default_checks.patch

diff --git a/target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch
index 11595a18dac317e72b778dbc0f7947f2523dbf0b..140889d8671cdbbd0bf4c187768cfb0ef0205a84 100644 (file)
--- a/target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch
+++ b/target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch
@@ -76,11 +76,10 @@
  
        counters = alloc_counters(table);
        if (IS_ERR(counters))
-@@ -960,6 +989,14 @@ copy_entries_to_user(unsigned int total_
-                       ret = -EFAULT;
+@@ -961,6 +990,14 @@ copy_entries_to_user(unsigned int total_
                        goto free_counters;
                }
-+
+ 
 +              flags = e->ip.flags & IPT_F_MASK;
 +              if (copy_to_user(userptr + off
 +                               + offsetof(struct ipt_entry, ip.flags),
@@ -88,6 +87,7 @@
 +                      ret = -EFAULT;
 +                      goto free_counters;
 +              }
- 
++
                for (i = sizeof(struct ipt_entry);
                     i < e->target_offset;
+                    i += m->u.match_size) {