From patchwork Thu May 21 16:14:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1295339 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=mG7WBE9b; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49SZXk2pdnz9sRf for ; Fri, 22 May 2020 02:17:58 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ED55C81E84; Thu, 21 May 2020 18:15:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mG7WBE9b"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 47EF081E5F; Thu, 21 May 2020 18:15:41 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf43.google.com (mail-qv1-xf43.google.com [IPv6:2607:f8b0:4864:20::f43]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5803A81E50 for ; Thu, 21 May 2020 18:15:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qv1-xf43.google.com with SMTP id x13so3327084qvr.2 for ; Thu, 21 May 2020 09:15:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GB+W2R40o6k9UDV10sxa5Xa3KvT8gt35A0ScHUXuqPs=; b=mG7WBE9blR8XnmKGug7R2AGtc2wRoHVEaitu8VpUaZJnuCe1IWNTsVprL2rXVDyiUv M8UmZqK7kNRvwlbB77wzDz2h/oAEXoZ9kAQaMkm/T31uPBZPmu33hczQ0ZzfCcLAwviA Pst8YhpoiGMdfg1NvMHMiC5jtlkIRuqRXsQ0kPUdqoDnxvLhq4EQIhJv8qpBePWanE6o UplVd8HI+nXS9NViC6eFzVt40wKxDlL7msF52eBGaimc39HUDF24ruZq1wMQNg0/oaGl KfDV9td2S1+7vV/VY71SGUmS0L0JPpsWawyqzdPsKMYJjTIbowHEYUzAZMIdxUu6q+yt FMgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GB+W2R40o6k9UDV10sxa5Xa3KvT8gt35A0ScHUXuqPs=; b=cYGeXbvo1aq9rDXnj1pkW43styuZE2KuOUzsnQr77PV4gUb65wLtGQMtHKG9sG+rXk 2acJma/W1eQr3dPsnRjvTcTdZTtlI8RpIC7QDTFFolLS8Puogr9j6/ywMMG8UdpOogdT Ef9snYsLYUgnTVWILaryBuXV6/NbesgEcvlzhVnOmEaWWGYrvHn9xTiBTWVVGS0DuUxB acVWiNJUgFUk2syMonululg8Cy3Iw8x9uiMkcQ04NjIW7UzPtRXOdP6MkP7ViqOlko5y gycmN4YLE1qCKb/ZSpdHI53SlWzzW3t63uaCjRhfTowDiYn8hmNILeBc6J9kot5ORxka yOww== X-Gm-Message-State: AOAM533MJfUqkF+uRU9zPcyksIu5i6kpmn0/ce/NDYtq5z29oysv+64R zjF7d+cBloJe7pA9twgKqsztLZErfFM= X-Google-Smtp-Source: ABdhPJwaXHvQ546SDexzQeMPVI6Mcxqr729VNVRSZknTWm4QD/90hQdaWQNBzW/VpAMNwmBjQ1+9vA== X-Received: by 2002:ad4:58cb:: with SMTP id dh11mr6693039qvb.211.1590077736092; Thu, 21 May 2020 09:15:36 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id e28sm5183538qkn.17.2020.05.21.09.15.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2020 09:15:35 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Bin Meng , Rick Chen , Sean Anderson , Tom Rini Subject: [PATCH v13 11/21] lib: Always set errno in hcreate_r Date: Thu, 21 May 2020 12:14:53 -0400 Message-Id: <20200521161503.384823-12-seanga2@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200521161503.384823-1-seanga2@gmail.com> References: <20200521161503.384823-1-seanga2@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean This could give a confusing error message if it failed and didn't set errno. Signed-off-by: Sean Anderson Reviewed-by: Bin Meng --- Changes in v5: - New lib/hashtable.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/hashtable.c b/lib/hashtable.c index b96dbe19be..7b6781bc35 100644 --- a/lib/hashtable.c +++ b/lib/hashtable.c @@ -110,8 +110,10 @@ int hcreate_r(size_t nel, struct hsearch_data *htab) } /* There is still another table active. Return with error. */ - if (htab->table != NULL) + if (htab->table != NULL) { + __set_errno(EINVAL); return 0; + } /* Change nel to the first prime number not smaller as nel. */ nel |= 1; /* make odd */ @@ -124,8 +126,10 @@ int hcreate_r(size_t nel, struct hsearch_data *htab) /* allocate memory and zero out */ htab->table = (struct env_entry_node *)calloc(htab->size + 1, sizeof(struct env_entry_node)); - if (htab->table == NULL) + if (htab->table == NULL) { + __set_errno(ENOMEM); return 0; + } /* everything went alright */ return 1;