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/xtables-translate.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/xtables-translate.c')
| -rw-r--r-- | iptables/xtables-translate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/iptables/xtables-translate.c b/iptables/xtables-translate.c index 0f95855b..76ad7eb6 100644 --- a/iptables/xtables-translate.c +++ b/iptables/xtables-translate.c @@ -480,7 +480,7 @@ static int xtables_xlate_main_common(struct nft_handle *h, return 1; } - if (nft_init(h, tables) < 0) { + if (nft_init(h, family, tables) < 0) { fprintf(stderr, "%s/%s Failed to initialize nft: %s\n", xtables_globals.program_name, xtables_globals.program_version, |