diff options
author | Liping Zhang <zlpnobody@gmail.com> | 2017-03-11 12:20:11 +0800 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-03-13 12:11:44 +0100 |
commit | c6cd7c22548a545ea9a831a1ea725d1716295b4a (patch) | |
tree | 07ac30f3364115c3eff3cd90ba195223eeeb3563 /src | |
parent | e02bd59c4009bedba89da88b199e715441975439 (diff) |
src: fix crash when inputting an incomplete set add command
After inputting the following nft command, set->keytype is not initialized
but we try to destroy it, so NULL pointer dereference will happen:
# nft add set t s
Segmentation fault (core dumped)
#0 dtype_free (dtype=0x0) at datatype.c:1049
#1 set_datatype_destroy (dtype=0x0) at datatype.c:1051
#2 0x0000000000407f1a in set_free (set=0x838790) at rule.c:213
#3 0x000000000042ff70 in nft_parse (scanner=scanner@entry=0x8386a0,
state=state@entry=0x7ffc313ea670) at parser_bison.c:9355
#4 0x000000000040727d in nft_run (scanner=scanner@entry=0x8386a0,
state=state@entry=0x7ffc313ea670, msgs=msgs@entry=0x7ffc313ea660)
at main.c:237
#5 0x0000000000406e4a in main (argc=<optimized out>, argv=<optimized
out>) at main.c:376
Fixes: b9b6092304ae ("evaluate: store byteorder for set keys")
Signed-off-by: Liping Zhang <zlpnobody@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/datatype.c | 2 | ||||
-rw-r--r-- | src/rule.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/datatype.c b/src/datatype.c index c61c4245..06a045bc 100644 --- a/src/datatype.c +++ b/src/datatype.c @@ -1047,7 +1047,7 @@ const struct datatype *set_datatype_alloc(const struct datatype *orig_dtype, void set_datatype_destroy(const struct datatype *dtype) { - if (dtype->flags & DTYPE_F_CLONE) + if (dtype && dtype->flags & DTYPE_F_CLONE) dtype_free(dtype); } @@ -211,8 +211,7 @@ void set_free(struct set *set) expr_free(set->init); handle_free(&set->handle); set_datatype_destroy(set->keytype); - if (set->datatype) - set_datatype_destroy(set->datatype); + set_datatype_destroy(set->datatype); xfree(set); } |