osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Gerald Combs 2018-01-12 14:05:14 -08:00 committed by Pascal Quantin
parent 777932efc6
commit 807a6c93d8
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-netlink-netfilter.c
View File

@ -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 =