From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bisque.elm.relay.mailchannels.net (bisque.elm.relay.mailchannels.net [23.83.212.18]) by sourceware.org (Postfix) with ESMTPS id 3358F3857738 for ; Fri, 15 Sep 2023 23:48:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3358F3857738 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=sourceware.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=sourceware.org 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 381D3840C7C; Fri, 15 Sep 2023 23:48:11 +0000 (UTC) Received: from pdx1-sub0-mail-a222.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id CD47B840DFA; Fri, 15 Sep 2023 23:48:10 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1694821690; a=rsa-sha256; cv=none; b=IL47JYCjqgl7WllegGzveyTuOk+KUNpYe+APBVfPJktEv9qOUd6MHqXt9brjvG9cTVLbam 0m0az4VjdlXprqRb1Fqa6kZI973FiBRL570zFr0ryHKKLHcrlSEqo0+6sGeLtYVAGbfFtT kHupvOZQPzfbd9E49Kg88MDbx3ITgO4YDP2vDC1rwyBaKYLZUc6DUQoAPEF57cy1brc6Hx bSxdkcviHzEqLbVlyOsNSu49zsqvKpClYwqndLqeSgBlH/520/go3ro5UDeSVow4jGYtVX ATQAoKYwJS3uO53HDoYAGentZzq9Ytx1LBRY/KxqfYWFItmW2SgopXl0yo+XgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1694821690; 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=E5QddQiUDvbgUz5bP7I7Z/m0ATa6M30f0AkNDZtBp7I=; b=3+Y8jYO/5KpVWqrflzX8hvzxavX6OR9hHbyQoz7yi/OtiYzju6y/hz2iveB3TmqCMh8LWs 86QeVZlIoDAKxmTc2CVwmmoPEgtZjgux8WHFPtrEGWf0/J5D6J5ULwv7LWq7greFYHoScs JootmQWMz3K4x194mJoTTsdZE7zTosRsoiL8/Qa7GUYOij2UkoA8RbiHMxqxflsbb4qkds sdCZP41vSvDkqrHJZz825awT5396t4N8PdHr/mJO5tNldfXmki4yejrYWulvNNrSfyoMyh F6do2x4Hul8TO9yOc5bQQTDt6hSACZYg4GAVcGw0jk4TW1viEMo2o5opSdjOGw== ARC-Authentication-Results: i=1; rspamd-7d5dc8fd68-9hnkt; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MC-Copy: stored-urls X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Chief-Ruddy: 189af2c82fbf6653_1694821691073_1759450782 X-MC-Loop-Signature: 1694821691073:2509825348 X-MC-Ingress-Time: 1694821691073 Received: from pdx1-sub0-mail-a222.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.114.198.214 (trex/6.9.1); Fri, 15 Sep 2023 23:48:11 +0000 Received: from fedora.redhat.com (bras-vprn-toroon4834w-lp130-02-142-113-138-41.dsl.bell.ca [142.113.138.41]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a222.dreamhost.com (Postfix) with ESMTPSA id 4RnW8p325hz8Q; Fri, 15 Sep 2023 16:48:10 -0700 (PDT) From: Siddhesh Poyarekar To: libc-stable@sourceware.org Cc: DJ Delorie Subject: [pushed 2.35 12/13] gethosts: Return EAI_MEMORY on allocation failure Date: Fri, 15 Sep 2023 19:47:54 -0400 Message-ID: <20230915234755.1148216-13-siddhesh@sourceware.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230915234755.1148216-1-siddhesh@sourceware.org> References: <20230915234755.1148216-1-siddhesh@sourceware.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1172.3 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_SOFTFAIL,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 (cherry picked from commit b587456c0e7b59dcfdbd2d44db000a3bc8244e57) --- 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.41.0