diff options
| author | Phil Sutter <phil@nwl.cc> | 2020-02-21 14:55:52 +0100 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2020-02-24 12:04:30 +0100 |
| commit | d0446ab11182f6ca2adc486a124895f09a220c6e (patch) | |
| tree | 4ef308fcb3c979fb672db1182c39ac838223dae8 /iptables/nft.c | |
| parent | 0f40a8bc49d3f7b815336199931a82f919f37c4e (diff) | |
xtables: Review nft_init()
Move common code into nft_init(), such as:
* initial zeroing nft_handle fields
* family ops lookup and assignment to 'ops' field
* setting of 'family' field
This requires minor adjustments in xtables_restore_main() so extra field
initialization doesn't happen before nft_init() call.
As a side-effect, this fixes segfaulting xtables-monitor binary when
printing rules for trace event as in that code-path 'ops' field wasn't
initialized.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'iptables/nft.c')
| -rw-r--r-- | iptables/nft.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/iptables/nft.c b/iptables/nft.c index 2f0a8c4a..cf3ab9fe 100644 --- a/iptables/nft.c +++ b/iptables/nft.c @@ -789,8 +789,10 @@ int nft_restart(struct nft_handle *h) return 0; } -int nft_init(struct nft_handle *h, const struct builtin_table *t) +int nft_init(struct nft_handle *h, int family, const struct builtin_table *t) { + memset(h, 0, sizeof(*h)); + h->nl = mnl_socket_open(NETLINK_NETFILTER); if (h->nl == NULL) return -1; @@ -800,9 +802,14 @@ int nft_init(struct nft_handle *h, const struct builtin_table *t) return -1; } + h->ops = nft_family_ops_lookup(family); + if (!h->ops) + xtables_error(PARAMETER_PROBLEM, "Unknown family"); + h->portid = mnl_socket_get_portid(h->nl); h->tables = t; h->cache = &h->__cache[0]; + h->family = family; INIT_LIST_HEAD(&h->obj_list); INIT_LIST_HEAD(&h->err_list); |