diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2016-10-12 00:56:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-12 00:56:39 +0200 |
| commit | 093184fcc4232f9b7e397e872d18772592c16cd5 (patch) | |
| tree | ec112cdb04541c437183cade6d4cd95e6286e9e9 /target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch | |
| parent | 7f0cba3eb9b5ab3a575875593777f269363c4d42 (diff) | |
| parent | a7099373073304de9c0b6aa6d0909b4d079ebe2f (diff) | |
| download | master-187ad058-093184fcc4232f9b7e397e872d18772592c16cd5.tar.gz master-187ad058-093184fcc4232f9b7e397e872d18772592c16cd5.tar.bz2 master-187ad058-093184fcc4232f9b7e397e872d18772592c16cd5.zip | |
Merge pull request #127 from wigyori/legacy-revert
Revert legacy kernels (3.18/4.1) to last known-good release
Diffstat (limited to 'target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch index 74be425049..358d64b1a1 100644 --- a/target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch +++ b/target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch @@ -50,16 +50,25 @@ static bool ip_checkentry(const struct ipt_ip *ip) { -@@ -650,6 +676,8 @@ find_check_entry(struct ipt_entry *e, st - struct xt_mtchk_param mtpar; - struct xt_entry_match *ematch; +@@ -565,7 +591,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; + +@@ -574,6 +600,8 @@ check_entry(const struct ipt_entry *e, c + return -EINVAL; + } + ip_checkdefault(&e->ip); + - j = 0; - mtpar.net = net; - mtpar.table = name; -@@ -942,6 +970,7 @@ copy_entries_to_user(unsigned int total_ + if (e->target_offset + sizeof(struct xt_entry_target) > + e->next_offset) + return -EINVAL; +@@ -935,6 +963,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)) -@@ -972,6 +1001,14 @@ copy_entries_to_user(unsigned int total_ +@@ -965,6 +994,14 @@ copy_entries_to_user(unsigned int total_ ret = -EFAULT; goto free_counters; } |