diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-12 12:49:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-12 12:49:30 -0400 |
| commit | b747594829aab6dcd2afadb9040d48f8b5a3d4f2 (patch) | |
| tree | 452190cff4e9fc83129243a64225a3849440dc6e /include/linux | |
| parent | 4665c6b04651e96c1e2eb9129a30d6055040ff73 (diff) | |
| parent | c04a3f730021c304c7cc4bc30ee57ee70ad98d57 (diff) | |
| download | linux-stable-b747594829aab6dcd2afadb9040d48f8b5a3d4f2.tar.gz linux-stable-b747594829aab6dcd2afadb9040d48f8b5a3d4f2.tar.bz2 linux-stable-b747594829aab6dcd2afadb9040d48f8b5a3d4f2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for your net tree, they are:
1) Fixed hashtable representation doesn't support timeout flag, skip it
otherwise rules to add elements from the packet fail bogusly fail with
EOPNOTSUPP.
2) Fix bogus error with 32-bits ebtables userspace and 64-bits kernel,
patch from Florian Westphal.
3) Sanitize proc names in several x_tables extensions, also from Florian.
4) Add sanitization to ebt_among wormhash logic, from Florian.
5) Missing release of hook array in flowtable.
====================
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter/x_tables.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index 1313b35c3ab7..14529511c4b8 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -285,6 +285,8 @@ unsigned int *xt_alloc_entry_offsets(unsigned int size); bool xt_find_jump_offset(const unsigned int *offsets, unsigned int target, unsigned int size); +int xt_check_proc_name(const char *name, unsigned int size); + int xt_check_match(struct xt_mtchk_param *, unsigned int size, u_int8_t proto, bool inv_proto); int xt_check_target(struct xt_tgchk_param *, unsigned int size, u_int8_t proto, |