rule: do not crash if to-be-printed flowtable lacks priority
Florian Westphal
maintainerPATCH 1/1 rule: do not crash if to-be-printed flowtable lacks priority
Print an empty flowtable rather than crashing when dereferencing flowtable->priority.expr (its NULL).
Signed-off-by Florian Westphal <[email protected]>
--- src/rule.c | 15 +++++++++------ .../testcases/bogons/flowtable-no-priority-crash | 6 ++++++ 2 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 tests/shell/testcases/bogons/flowtable-no-priority-crash
src/rule.c +9 -6
@@ -2088,12 +2088,15 @@ static void flowtable_print_declaration(const struct flowtable *flowtable,if (nft_output_handle (octx))nft_print (octx," # handle %" PRIu64, flowtable->handle.handle.id);nft_print (octx,"%s" , opts->nl); -nft_print (octx,"%s%shook %s priority %s%s" , - opts->tab, opts->tab, -hooknum2str (NFPROTO_NETDEV , flowtable->hook.num), -prio2str (octx, priobuf,sizeof (priobuf),NFPROTO_NETDEV , - flowtable->hook.num, flowtable->priority.expr), - opts->stmt_separator); + +if (flowtable->priority.expr) { +nft_print (octx,"%s%shook %s priority %s%s" , + opts->tab, opts->tab, +hooknum2str (NFPROTO_NETDEV , flowtable->hook.num), +prio2str (octx, priobuf,sizeof (priobuf),NFPROTO_NETDEV , + flowtable->hook.num, flowtable->priority.expr), + opts->stmt_separator); + }if (flowtable->dev_array_len >0 ) {nft_print (octx,"%s%sdevices = { " , opts->tab, opts->tab);
tests/shell/testcases/bogons/flowtable-no-priority-crash new file +6 -0
@@ -0,0 +1,6 @@ +reset rules +table inet filter { + flowtable f { + devices = { lo } + } +}
Signature · 1 line
2.41.0