diff options
author | Jakub Kicinski <kuba@kernel.org> | 2022-06-22 08:41:40 +0300 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-06-22 08:41:41 +0300 |
commit | 53664d51d3510e1d4092e539c5928fc9951f63b0 (patch) | |
tree | 29ea80bb4439e29f5192dda17e065946ee51d012 /net/x25 | |
parent | 2642cc6c3bbe0900ba15bab078fd15ad8baccbc5 (diff) | |
parent | fcd53c51d03709bc429822086f1e9b3e88904284 (diff) | |
download | linux-53664d51d3510e1d4092e539c5928fc9951f63b0.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
1) Use get_random_u32() instead of prandom_u32_state() in nft_meta
and nft_numgen, from Florian Westphal.
2) Incorrect list head in nfnetlink_cttimeout in recent update coming
from previous development cycle. Also from Florian.
3) Incorrect path to pktgen scripts for nft_concat_range.sh selftest.
From Jie2x Zhou.
4) Two fixes for the for nft_fwd and nft_dup egress support, from Florian.
* git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
netfilter: nf_dup_netdev: add and use recursion counter
netfilter: nf_dup_netdev: do not push mac header a second time
selftests: netfilter: correct PKTGEN_SCRIPT_PATHS in nft_concat_range.sh
netfilter: cttimeout: fix slab-out-of-bounds read typo in cttimeout_net_exit
netfilter: use get_random_u32 instead of prandom
====================
Link: https://lore.kernel.org/r/20220621085618.3975-1-pablo@netfilter.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/x25')
0 files changed, 0 insertions, 0 deletions