From: Pablo Neira Ayuso Date: Tue, 19 Sep 2023 16:15:17 +0000 (+0200) Subject: datatype: initialize TYPE_CT_EVENTBIT slot in datatype array X-Git-Tag: v1.0.9~50 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d9e23a9e9c3c729784a3add41639cbd3f72d504;p=thirdparty%2Fnftables.git datatype: initialize TYPE_CT_EVENTBIT slot in datatype array Matching on ct event makes no sense since this is mostly used as statement to globally filter out ctnetlink events, but do not crash if it is used from concatenations. Add the missing slot in the datatype array so this does not crash. Fixes: 2595b9ad6840 ("ct: add conntrack event mask support") Reported-by: Thomas Haller Signed-off-by: Pablo Neira Ayuso --- diff --git a/include/ct.h b/include/ct.h index aa0504c5..0a705fd0 100644 --- a/include/ct.h +++ b/include/ct.h @@ -40,5 +40,6 @@ extern const struct datatype ct_dir_type; extern const struct datatype ct_state_type; extern const struct datatype ct_status_type; extern const struct datatype ct_label_type; +extern const struct datatype ct_event_type; #endif /* NFTABLES_CT_H */ diff --git a/src/ct.c b/src/ct.c index d7dec255..b2635543 100644 --- a/src/ct.c +++ b/src/ct.c @@ -132,7 +132,7 @@ static const struct symbol_table ct_events_tbl = { }, }; -static const struct datatype ct_event_type = { +const struct datatype ct_event_type = { .type = TYPE_CT_EVENTBIT, .name = "ct_event", .desc = "conntrack event bits", diff --git a/src/datatype.c b/src/datatype.c index ee0e9701..14d5a0e6 100644 --- a/src/datatype.c +++ b/src/datatype.c @@ -75,6 +75,7 @@ static const struct datatype *datatypes[TYPE_MAX + 1] = { [TYPE_ECN] = &ecn_type, [TYPE_FIB_ADDR] = &fib_addr_type, [TYPE_BOOLEAN] = &boolean_type, + [TYPE_CT_EVENTBIT] = &ct_event_type, [TYPE_IFNAME] = &ifname_type, [TYPE_IGMP_TYPE] = &igmp_type_type, [TYPE_TIME_DATE] = &date_type,