summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2018-07-17 07:17:53 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2018-07-20 15:31:43 +0200
commitb8088dda98b9064a2b3007fe54b03ede70a15602 (patch)
tree2c231e58617e7cacb2dd007e15691e154f9f4069 /include
parentnetfilter: nft_set_rbtree: fix panic when destroying set by GC (diff)
downloadlinux-b8088dda98b9064a2b3007fe54b03ede70a15602.tar.xz
linux-b8088dda98b9064a2b3007fe54b03ede70a15602.zip
netfilter: nf_tables: use dev->name directly
no need to store the name in separate area. Furthermore, it uses kmalloc but not kfree and most accesses seem to treat it as char[IFNAMSIZ] not char *. Remove this and use dev->name instead. In case event zeroed dev, just omit the name in the dump. Fixes: d92191aa84e5f1 ("netfilter: nf_tables: cache device name in flowtable object") Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
-rw-r--r--include/net/netfilter/nf_tables.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 4e82a4c49912..dc417ef0a0c5 100644
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -1124,7 +1124,6 @@ struct nft_flowtable {
u32 genmask:2,
use:30;
u64 handle;
- char *dev_name[NFT_FLOWTABLE_DEVICE_MAX];
/* runtime data below here */
struct nf_hook_ops *ops ____cacheline_aligned;
struct nf_flowtable data;