diff options
author | David S. Miller <davem@davemloft.net> | 2018-04-23 16:22:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-04-23 16:22:24 -0400 |
commit | 77621f024d6be732e43366a42203486b6ec89acd (patch) | |
tree | 423ad59e9d82db870b5148091111765d06f936ac /samples/bpf/cookie_uid_helper_example.c | |
parent | aa8f8778493c85fff480cdf8b349b1e1dcb5f243 (diff) | |
parent | 5a786232eb69a1f870ddc0cfd69d5bdef241a2ea (diff) | |
download | linux-77621f024d6be732e43366a42203486b6ec89acd.tar.gz linux-77621f024d6be732e43366a42203486b6ec89acd.tar.bz2 linux-77621f024d6be732e43366a42203486b6ec89acd.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter/IPVS fixes for net
The following patchset contains Netfilter/IPVS fixes for your net tree,
they are:
1) Fix SIP conntrack with phones sending session descriptions for different
media types but same port numbers, from Florian Westphal.
2) Fix incorrect rtnl_lock mutex logic from IPVS sync thread, from Julian
Anastasov.
3) Skip compat array allocation in ebtables if there is no entries, also
from Florian.
4) Do not lose left/right bits when shifting marks from xt_connmark, from
Jack Ma.
5) Silence false positive memleak in conntrack extensions, from Cong Wang.
6) Fix CONFIG_NF_REJECT_IPV6=m link problems, from Arnd Bergmann.
7) Cannot kfree rule that is already in list in nf_tables, switch order
so this error handling is not required, from Florian Westphal.
8) Release set name in error path, from Florian.
9) include kmemleak.h in nf_conntrack_extend.c, from Stepheh Rothwell.
10) NAT chain and extensions depend on NF_TABLES.
11) Out of bound access when renaming chains, from Taehee Yoo.
12) Incorrect casting in xt_connmark leads to wrong bitshifting.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'samples/bpf/cookie_uid_helper_example.c')
0 files changed, 0 insertions, 0 deletions