aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-netlink-netfilter.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-01-12 14:05:14 -0800
committerPascal Quantin <pascal.quantin@gmail.com>2018-01-13 08:14:21 +0000
commit807a6c93d8c04403c10196ae3ba2b96136899e96 (patch)
tree881109dde5a2e4b2a3304dbaf8d18b14cf98193f /epan/dissectors/packet-netlink-netfilter.c
parent777932efc61a62d6ad56ecd620a76972e438478a (diff)
netfilter: Make sure our bitmask field arrays are NULL terminated.
Add a trailing NULLs so that we don't read past the end of hfi_nfct_attr_status_flags and hfi_nfexp_attr_flags_bitfield. Bug: 14336 Change-Id: I1e96a89f60df2d653c4f3ad63f29cf57eb0224a5 Reviewed-on: https://code.wireshark.org/review/25290 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-netlink-netfilter.c')
-rw-r--r--epan/dissectors/packet-netlink-netfilter.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-netlink-netfilter.c b/epan/dissectors/packet-netlink-netfilter.c
index 2d6242a54b..02895ff23a 100644
--- a/epan/dissectors/packet-netlink-netfilter.c
+++ b/epan/dissectors/packet-netlink-netfilter.c
@@ -699,6 +699,7 @@ static const int *hfi_nfct_attr_status_flags[] = {
&hfi_nfct_attr_status_flag_assured.id,
&hfi_nfct_attr_status_flag_seen_reply.id,
&hfi_nfct_attr_status_flag_expected.id,
+ NULL
};
static header_field_info hfi_nfct_attr_status NETLINK_NETFILTER_HFI_INIT =
@@ -938,6 +939,7 @@ static const int *hfi_nfexp_attr_flags_bitfield[] = {
&hfi_nfexp_attr_flag_userspace.id,
&hfi_nfexp_attr_flag_inactive.id,
&hfi_nfexp_attr_flag_permanent.id,
+ NULL
};
static header_field_info hfi_nfexp_attr_flags NETLINK_NETFILTER_HFI_INIT =