diff options
| author |   David S. Miller <davem@davemloft.net> | 2022-03-28 08:57:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-03-28 08:57:10 -0700 |
| commit | 2aa2f88c970783633da3d248ab3df7e15a416eca (patch) | |
| tree | 7d74f1d35ccd72b1af22a8225cba65c42148a146 /net/netfilter/core.c | |
| parent | net/sched: act_ct: fix ref leak when switching zones (diff) | |
| parent | memcg: enable accounting for nft objects (diff) | |
| download | linux-dev-2aa2f88c970783633da3d248ab3df7e15a416eca.tar.xz linux-dev-2aa2f88c970783633da3d248ab3df7e15a416eca.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Incorrect output device in nf_egress hook, from Phill Sutter.
2) Preserve liberal flag in TCP conntrack state, reported by Sven Auhagen.
3) Use GFP_KERNEL_ACCOUNT flag for nf_tables objects, from Vasily Averin.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/core.c')
| -rw-r--r-- | net/netfilter/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/core.c b/net/netfilter/core.c index 9a4feb922cf6..dcf752b55a52 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -58,7 +58,7 @@ static struct nf_hook_entries *allocate_hook_entries_size(u16 num) if (num == 0) return NULL; - e = kvzalloc(alloc, GFP_KERNEL); + e = kvzalloc(alloc, GFP_KERNEL_ACCOUNT); if (e) e->num_hook_entries = num; return e; |