From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bird.elm.relay.mailchannels.net (bird.elm.relay.mailchannels.net [23.83.212.17]) by sourceware.org (Postfix) with ESMTPS id 52E59385AC3D for ; Mon, 14 Mar 2022 09:49:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 52E59385AC3D X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id BC9152C1677 for ; Mon, 14 Mar 2022 09:49:08 +0000 (UTC) Received: from pdx1-sub0-mail-a305.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 4E5F32C16A5 for ; Mon, 14 Mar 2022 09:49:08 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1647251348; a=rsa-sha256; cv=none; b=7R3iUKHNjCAA3H/AOwitwrtEYuwQt+6X6sT+xIUqPC+5w0sJ7H7qcskf6zKm388rd0af0P Om3QVR3NNxSFvFJMY7lSYABzF//e0aiP+WCiG4VS1KEYczkKcs5A6rkN1jzPOReVnCQGGS M4zouoSVfpPjDawhXNV5BxQJBm+VTdC9qF+A+A5aBqzWY1inSV5VNnEcfIyw4IXHxXIbdJ cfPw2Bp4T5gBrlsLyAcOfCz2/Rb1U3o4K7kgBiXAkYlhTiu93BA5Q1a9KZgQKg9QAOIpNx a96Gi5awpuDS6mccApl1KD/3sm8hQFKrC5Y5uKPvTCoF4j8LLxnLBMduW15Qlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1647251348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XHmgONQ5TBwl+90ON3gidBVEACYDcJntNMhfdIqgvys=; b=lDM26rWb+5B3V0xfnAvmNKtpPB60Z/JDdPfeo2L+T97XyMxmINzyWwZ83fLsYqTpQKMtwb hXgVjHPHGR8jagbc74d+ptWs4OWOeUsL/9rgyP4wKyr/XMKmQM4Gguz6rTbmP4wY1L7zdy bcc66IJAejh5oir562h7Cw8BSwmVGg7t1ips5fPOiV+bXkMn509D2M0aleoO9zpyg0kbaJ 762t6qntsrUOgo9p2L98oYTT/Md+4OWAMCyKrns+D9ZqeP+KkMt9jWQW6OYdpadmriuHXn ZFOqfwFmxy393jLKseEvV3SeSOjn9K6zSAZ5jsdN0zhBwE1BCmQjKu0ps9xrEw== ARC-Authentication-Results: i=1; rspamd-74bfb75fc6-hjmmt; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a305.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.112.55.223 (trex/6.5.3); Mon, 14 Mar 2022 09:49:08 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-White-Soft: 0537f5f9451cbde8_1647251348618_533979124 X-MC-Loop-Signature: 1647251348618:139450647 X-MC-Ingress-Time: 1647251348617 Received: from rhbox.redhat.com (unknown [106.220.192.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a305.dreamhost.com (Postfix) with ESMTPSA id 4KHBZV73nsz2g for ; Mon, 14 Mar 2022 02:49:06 -0700 (PDT) From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Subject: [PATCH v2 12/12] gethosts: Return EAI_MEMORY on allocation failure Date: Mon, 14 Mar 2022 15:18:35 +0530 Message-Id: <20220314094835.1159523-13-siddhesh@sourceware.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220314094835.1159523-1-siddhesh@sourceware.org> References: <20220308100717.1006126-1-siddhesh@sourceware.org> <20220314094835.1159523-1-siddhesh@sourceware.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1171.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NEUTRAL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Mar 2022 09:49:11 -0000 All other cases of failures due to lack of memory return EAI_MEMORY, so it seems wrong to return EAI_SYSTEM here. The only reason convert_hostent_to_gaih_addrtuple could fail is on calloc failure. Signed-off-by: Siddhesh Poyarekar --- sysdeps/posix/getaddrinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index eebed824a8..5cd988bec5 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -303,13 +303,13 @@ gethosts (nss_gethostbyname3_r fct, int family, const char *name, else if (status == NSS_STATUS_SUCCESS) { if (!convert_hostent_to_gaih_addrtuple (req, family, &th, res)) - return -EAI_SYSTEM; + return -EAI_MEMORY; if (localcanon != NULL && res->canon == NULL) { char *canonbuf = __strdup (localcanon); if (canonbuf == NULL) - return -EAI_SYSTEM; + return -EAI_MEMORY; res->canon = canonbuf; } } -- 2.35.1