diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-01-12 20:25:29 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-01-12 20:25:29 -0800 |
| commit | c8a8ead01736419a14c3106e1f26a79d74fc84c7 (patch) | |
| tree | 24a6bfdd5bd71609a7d8d4bd9d59c6ef018f2234 /net/rxrpc/key.c | |
| parent | 5527d0ea199354c798a63b50d911eeda6ee471ba (diff) | |
| parent | 869f4fdaf4ca7bb6e0d05caf6fa1108dddc346a7 (diff) | |
| download | lwn-c8a8ead01736419a14c3106e1f26a79d74fc84c7.tar.gz lwn-c8a8ead01736419a14c3106e1f26a79d74fc84c7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
1) Pass conntrack -f to specify family in netfilter conntrack helper
selftests, from Chen Yi.
2) Honor hashsize modparam from nf_conntrack_buckets sysctl,
from Jesper D. Brouer.
3) Fix memleak in nf_nat_init() error path, from Dinghao Liu.
* git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf:
netfilter: nf_nat: Fix memleak in nf_nat_init
netfilter: conntrack: fix reading nf_conntrack_buckets
selftests: netfilter: Pass family parameter "-f" to conntrack tool
====================
Link: https://lore.kernel.org/r/20210112222033.9732-1-pablo@netfilter.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/rxrpc/key.c')
0 files changed, 0 insertions, 0 deletions