src: add xzalloc_array() and use it to allocate the expression hashtable
Pablo Neira Ayuso
maintainerPATCH 1/1 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")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/utils.h | 1 + src/netlink_delinearize.c | 2 +- src/utils.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-)
include/utils.h +1 -0
@@ -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);
src/netlink_delinearize.c +1 -1
@@ -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++) {
src/utils.c +10 -0
@@ -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);
Signature · 1 line
2.30.2
Quoted 4 lines · Pablo Neira Ayuso
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.
Oh, stupid mistake. Thanks for the fix!
Quoted 2 lines
Fixes c4058f96c6a5 ("netlink_delinearize: Fix suspicious calloc() call")Signed-off-by Pablo Neira Ayuso <[email protected]>
Acked-by Phil Sutter <[email protected]>
Cheers, Phil