From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from burlywood.elm.relay.mailchannels.net (burlywood.elm.relay.mailchannels.net [23.83.212.26]) by sourceware.org (Postfix) with ESMTPS id 61F84394FC30 for ; Thu, 17 Mar 2022 08:12:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 61F84394FC30 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 77B446C24C3; Thu, 17 Mar 2022 08:12:29 +0000 (UTC) Received: from pdx1-sub0-mail-a307.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 814516C1FF3; Thu, 17 Mar 2022 08:12:28 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1647504748; a=rsa-sha256; cv=none; b=raj52U1Tcx+o16PEYI5yqzkYnDlzxVSWTWlhwEdk+1qWKcTfYrN8NjfeKP61HBBHLoDBff qZk3Q49/BnqhIDLPctfMLGmI21j62JSHAo1R5fHAO12ygt3loKUf/4SUMozAYcTOT+6l+C Pn8nahrmHLB24fn0uJo4syhFg/Cqrz6hW7MyOT2+U7VLeuPsjTANhBvUEDWsttFRq1ElWg jqKz2pIY8hTIWIhAadZAcvUr829o3g4Fj9dvOUYinQR8qal9kTgB0Zflvaj675hzpcQWsL zNKWm9gbwaj0QaPBN1bON9GjH50+IM/EStcgEiR8pBWCb8tozcZR4wcS32ck2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1647504748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u11TagLvQeFUy6GvHTipQVqq24Hf9aGsofKOwSIESBo=; b=F9bksLpNdcfWj8SJJo+N1tGvSKHdmxxGHgecEOEhxn4eiZiLGetIFxLUlZKq1yJf+UbD1R q8c0KMFzQJluuilAE/2frqs/8hcOv3Ry5ptmJQ86u7cnPt0BqjV1pzv+ol16+Ofh1c6imq 4Dc2csL2+LkynsA13iCkeuSRIycmprIzjtrWlrdBXNc3BJWPAnVH7JQkDqB/2QFOoWFkE/ 6XOu4RnfaAWgjpPWQIU+nJ5apnUhL4waG9UqbYZs3+kplugDZ+Zpku9Bf1FPsiHKXaZPQN ltAZJWr/QMbcptMsSTWUy5tG74ydbGt4fSOrxWyKOm+WWwkArNXO7zWGgy13UQ== ARC-Authentication-Results: i=1; rspamd-c9cb649d9-szwtj; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a307.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.112.20.208 (trex/6.5.3); Thu, 17 Mar 2022 08:12:29 +0000 X-MC-Relay: Junk X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Cellar-Society: 69383f445e8d0184_1647504749257_660557005 X-MC-Loop-Signature: 1647504749257:2212357599 X-MC-Ingress-Time: 1647504749257 Received: from rhbox.intra.reserved-bit.com (unknown [1.186.123.88]) (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-a307.dreamhost.com (Postfix) with ESMTPSA id 4KK0HZ5fDcz21; Thu, 17 Mar 2022 01:12:26 -0700 (PDT) From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Subject: [PATCH v3 12/12] gethosts: Return EAI_MEMORY on allocation failure Date: Thu, 17 Mar 2022 13:41:40 +0530 Message-Id: <20220317081140.3098156-13-siddhesh@sourceware.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220317081140.3098156-1-siddhesh@sourceware.org> References: <20220308100717.1006126-1-siddhesh@sourceware.org> <20220317081140.3098156-1-siddhesh@sourceware.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3495.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H2, RCVD_IN_SBL, 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: Thu, 17 Mar 2022 08:12:32 -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 Reviewed-by: DJ Delorie --- 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 f5d4a5cfd9..0ece3b46b7 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