From patchwork Wed Dec 13 16:09:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 82072 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2569C385417D for ; Wed, 13 Dec 2023 16:10:17 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 75C903858019 for ; Wed, 13 Dec 2023 16:09:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 75C903858019 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 75C903858019 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702483805; cv=none; b=oClmDIROaPfYC+efV/fR8LiPcBDws/uuR2B6w8v39lMDYAgF6FjPqvmpRjqyczLNUUOIdpfijqIZraKu8IYDM4hq5p47A8OR04oWqi2iT7kKNwVQmtpGlMpE90OHFhTWDmJiRfGVFuIxWWWhifeCwcKrc7tvO0NHry9DcXLJXxk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702483805; c=relaxed/simple; bh=Yba12OE73PpuNvfd8XTKqb8vo5l4WQCbPGPRBUVl8So=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=kdH0Y4ApKE0PdJAQw4rvQVRZjuspqzZTSY9D3nK2MSdG/4F1Qq5dEi+cnu9uKINCyNyxZuzUN0LinYSE/wyZhJ5Xf2VAlw2Uo3ywTNsz3bLL1ZcyCkmge3N+Kb5P93pZP0unWPIyWp08K4o19Nw3k2HVSmaUB3+8n3hi22ugX3E= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from hawking.nue2.suse.org (unknown [10.168.4.11]) by smtp-out2.suse.de (Postfix) with ESMTP id 65D221F443 for ; Wed, 13 Dec 2023 16:09:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702483794; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=WIS4kz0axdRc3graM5pjRUc7tQJQpEs5RpN4MZQYaT4=; b=YCsAaa+ebJ7c/Te9NLnRUb2Fl4PhuWRkkQGjsUOCz7qrDaHvFytmLM/aK1YnA+jpJcCRPK Gb1l7kvhMFeol1i9h03tLkTNJecHhQMaSsYmFE0RPJ3KIb9UPLGC5e3BR770yMVI+s68QK vngiJsbQNI1a4x/FT1Hnfjir4LuDClA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702483794; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=WIS4kz0axdRc3graM5pjRUc7tQJQpEs5RpN4MZQYaT4=; b=2HfAfQ4vbVRG59YQ/DIDOrb1oYadATbqml+Lq3Zi/bL3mq1r7AfzscFfnjwfOdlTKSXtkV v+70rtzB3Oi9S2DQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702483794; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=WIS4kz0axdRc3graM5pjRUc7tQJQpEs5RpN4MZQYaT4=; b=YCsAaa+ebJ7c/Te9NLnRUb2Fl4PhuWRkkQGjsUOCz7qrDaHvFytmLM/aK1YnA+jpJcCRPK Gb1l7kvhMFeol1i9h03tLkTNJecHhQMaSsYmFE0RPJ3KIb9UPLGC5e3BR770yMVI+s68QK vngiJsbQNI1a4x/FT1Hnfjir4LuDClA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702483794; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=WIS4kz0axdRc3graM5pjRUc7tQJQpEs5RpN4MZQYaT4=; b=2HfAfQ4vbVRG59YQ/DIDOrb1oYadATbqml+Lq3Zi/bL3mq1r7AfzscFfnjwfOdlTKSXtkV v+70rtzB3Oi9S2DQ== Received: by hawking.nue2.suse.org (Postfix, from userid 17005) id 5166D4A04E0; Wed, 13 Dec 2023 17:09:54 +0100 (CET) From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] getaddrinfo: translate ENOMEM to EAI_MEMORY (bug 31163) X-Yow: I'm thinking about DIGITAL READ-OUT systems and computer-generated IMAGE FORMATIONS.. Date: Wed, 13 Dec 2023 17:09:54 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Spam-Level: X-Spam-Score: -2.90 X-Spam-Level: X-Spam-Score: -2.94 X-Spamd-Result: default: False [-2.94 / 50.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; BAYES_HAM(-2.84)[99.31%] X-Spam-Flag: NO Authentication-Results: smtp-out2.suse.de; none X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org When __resolv_context_get returns NULL due to out of memory, translate it to a return value of EAI_MEMORY. Reviewed-by: Florian Weimer --- nss/getaddrinfo.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nss/getaddrinfo.c b/nss/getaddrinfo.c index 6902a47224..b1cb4d7006 100644 --- a/nss/getaddrinfo.c +++ b/nss/getaddrinfo.c @@ -616,7 +616,14 @@ get_nss_addresses (const char *name, const struct addrinfo *req, function variant. */ res_ctx = __resolv_context_get (); if (res_ctx == NULL) - no_more = 1; + { + if (errno == ENOMEM) + { + result = -EAI_MEMORY; + goto out; + } + no_more = 1; + } while (!no_more) {