diff options
author | Zoltan HERPAI <wigyori@uid0.hu> | 2016-10-12 00:15:28 +0200 |
---|---|---|
committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-10-12 00:15:28 +0200 |
commit | a7099373073304de9c0b6aa6d0909b4d079ebe2f (patch) | |
tree | ec112cdb04541c437183cade6d4cd95e6286e9e9 /target/linux/generic/patches-4.1/610-netfilter_match_bypass_default_checks.patch | |
parent | 4acd4da998e71c681f7030f9706abda055f95ccc (diff) | |
download | master-187ad058-a7099373073304de9c0b6aa6d0909b4d079ebe2f.tar.gz master-187ad058-a7099373073304de9c0b6aa6d0909b4d079ebe2f.tar.bz2 master-187ad058-a7099373073304de9c0b6aa6d0909b4d079ebe2f.zip |
Revert "kernel: bump 4.1 to 4.1.30"
Stay on 4.1.27
This reverts commit 231ef70f455fcc230a400af90a13e181a2c261cd.
Diffstat (limited to 'target/linux/generic/patches-4.1/610-netfilter_match_bypass_default_checks.patch')
-rw-r--r-- | target/linux/generic/patches-4.1/610-netfilter_match_bypass_default_checks.patch | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/target/linux/generic/patches-4.1/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/patches-4.1/610-netfilter_match_bypass_default_checks.patch index 1187845879..282cbdd0de 100644 --- a/target/linux/generic/patches-4.1/610-netfilter_match_bypass_default_checks.patch +++ b/target/linux/generic/patches-4.1/610-netfilter_match_bypass_default_checks.patch @@ -50,16 +50,25 @@ static bool ip_checkentry(const struct ipt_ip *ip) { -@@ -649,6 +675,8 @@ find_check_entry(struct ipt_entry *e, st - struct xt_mtchk_param mtpar; - struct xt_entry_match *ematch; +@@ -564,7 +590,7 @@ static void cleanup_match(struct xt_entr + } + + static int +-check_entry(const struct ipt_entry *e, const char *name) ++check_entry(struct ipt_entry *e, const char *name) + { + const struct xt_entry_target *t; + +@@ -573,6 +599,8 @@ check_entry(const struct ipt_entry *e, c + return -EINVAL; + } + ip_checkdefault(&e->ip); + - j = 0; - mtpar.net = net; - mtpar.table = name; -@@ -941,6 +969,7 @@ copy_entries_to_user(unsigned int total_ + if (e->target_offset + sizeof(struct xt_entry_target) > + e->next_offset) + return -EINVAL; +@@ -934,6 +962,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 +76,7 @@ counters = alloc_counters(table); if (IS_ERR(counters)) -@@ -971,6 +1000,14 @@ copy_entries_to_user(unsigned int total_ +@@ -964,6 +993,14 @@ copy_entries_to_user(unsigned int total_ ret = -EFAULT; goto free_counters; } |