Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40925C48BD1 for ; Fri, 11 Jun 2021 16:41:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 253A1613D0 for ; Fri, 11 Jun 2021 16:41:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230446AbhFKQnc (ORCPT ); Fri, 11 Jun 2021 12:43:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230344AbhFKQnb (ORCPT ); Fri, 11 Jun 2021 12:43:31 -0400 Received: from orbyte.nwl.cc (orbyte.nwl.cc [IPv6:2001:41d0:e:133a::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C656C061574 for ; Fri, 11 Jun 2021 09:41:32 -0700 (PDT) Received: from localhost ([::1]:41348 helo=xic) by orbyte.nwl.cc with esmtp (Exim 4.94.2) (envelope-from ) id 1lrkDq-0005eF-M8; Fri, 11 Jun 2021 18:41:30 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [nft PATCH 09/10] netlink_delinearize: Fix suspicious calloc() call Date: Fri, 11 Jun 2021 18:41:03 +0200 Message-Id: <20210611164104.8121-10-phil@nwl.cc> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210611164104.8121-1-phil@nwl.cc> References: <20210611164104.8121-1-phil@nwl.cc> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Parameter passed to sizeof() was wrong. While being at it, replace the whole call with xmalloc_array() which takes care of error checking. Fixes: 913979f882d13 ("src: add expression handler hashtable") Signed-off-by: Phil Sutter --- src/netlink_delinearize.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index a71d06d7fe12f..9a1cf3c4f7d90 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -1733,9 +1733,8 @@ void expr_handler_init(void) unsigned int i; uint32_t hash; - expr_handle_ht = calloc(NFT_EXPR_HSIZE, sizeof(expr_handle_ht)); - if (!expr_handle_ht) - memory_allocation_error(); + expr_handle_ht = xmalloc_array(NFT_EXPR_HSIZE, + sizeof(expr_handle_ht[0])); for (i = 0; i < array_size(netlink_parsers); i++) { hash = djb_hash(netlink_parsers[i].name) % NFT_EXPR_HSIZE; -- 2.31.1