src: add xzalloc_array() and use it to allocate the expression hashtable

Otherwise, assertion to ensure that no colission occur is hit due to
uninitialized hashtable memory area:

nft: netlink_delinearize.c:1741: expr_handler_init: Assertion `expr_handle_ht[hash] == NULL' failed.

Fixes: c4058f96c6a5 ("netlink_delinearize: Fix suspicious calloc() call")
Acked-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/utils.h b/include/utils.h
index f45f25132d18dac9b1b2bb9ae95f10f0f24251f7..ffbe2cbb75be57c64fb3d59233ab8efaebb285d3 100644 (file)
--- a/include/utils.h
+++ b/include/utils.h
@@ -133,6 +133,7 @@ extern void *xmalloc(size_t size);
 extern void *xmalloc_array(size_t nmemb, size_t size);
 extern void *xrealloc(void *ptr, size_t size);
 extern void *xzalloc(size_t size);
+extern void *xzalloc_array(size_t nmemb, size_t size);
 extern char *xstrdup(const char *s);
 extern void xstrunescape(const char *in, char *out);
 

diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index 9a1cf3c4f7d9022f1ed62bf85a353a7e09a375ee..57af71a75609acbe70a5ee6d3a50e6f995b8128a 100644 (file)
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -1733,7 +1733,7 @@ void expr_handler_init(void)
        unsigned int i;
        uint32_t hash;
 
-       expr_handle_ht = xmalloc_array(NFT_EXPR_HSIZE,
+       expr_handle_ht = xzalloc_array(NFT_EXPR_HSIZE,
                                       sizeof(expr_handle_ht[0]));
 
        for (i = 0; i < array_size(netlink_parsers); i++) {

diff --git a/src/utils.c b/src/utils.c
index 47f5b791547b1c6272df16b56aab64eff1cee33d..925841c571f5d8536b24f8bf84866fd142ddf317 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -50,6 +50,16 @@ void *xmalloc_array(size_t nmemb, size_t size)
        return xmalloc(nmemb * size);
 }
 
+void *xzalloc_array(size_t nmemb, size_t size)
+{
+       void *ptr;
+
+       ptr = xmalloc_array(nmemb, size);
+       memset(ptr, 0, nmemb * size);
+
+       return ptr;
+}
+
 void *xrealloc(void *ptr, size_t size)
 {
        ptr = realloc(ptr, size);