From patchwork Wed Nov 10 18:58:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 47426 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 85F7D3857C60 for ; Wed, 10 Nov 2021 19:00:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 85F7D3857C60 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1636570822; bh=6JrLzmofjvuOleZT5KvKeZpzQG+4z+TTXA8Uo0bfO5c=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=dkygLC+ZRJiQ+b4n4ZV89shfu9mzxqPnn+JYplUzBGWhiJaboS5BvLYVh+ze8WvSH SPQExDbKb54lpMq9snLLf5XrKc0DrljGSGzeJWBrh1GBhBaAVFMHgzWdynXG8r6Q7a C4CPrc1ck4yHsi9ojJRwoyII8dZ0GChStDz2b8Jo= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-vk1-xa31.google.com (mail-vk1-xa31.google.com [IPv6:2607:f8b0:4864:20::a31]) by sourceware.org (Postfix) with ESMTPS id 9C2CD385803B for ; Wed, 10 Nov 2021 18:58:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9C2CD385803B Received: by mail-vk1-xa31.google.com with SMTP id d128so1913245vkf.11 for ; Wed, 10 Nov 2021 10:58:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6JrLzmofjvuOleZT5KvKeZpzQG+4z+TTXA8Uo0bfO5c=; b=Z61YbkFi/erMcKYAmKHFTCWOvVkNn6jNg9zKdGbYbfn6RAUzIcxFwCV2t0cFUow+3+ DTJotjuqcnCHl6nSqQ1xYK/t1OqI95quV25TTQUM8ApBxKIw+iP48rSn6rvUbk6f9R+z ZU+OODOkuKbOiQABR2vzGsjy9E8sqSdk/fln6GMCvq4vdJ6dkTQVk98mm5IoGAgLjVnD VN6V/qdw+Y6gw9gDXmUoYBLuH5MWax3a3z19B/bzLISL4IeCv9rqLSTjgV4vcnsLX+zg BUypCMb/zJtt7yIINQdW98czTMIODvSj62z1VY986MSnygLqYVIjkkrz51erfG1aS703 TO8g== X-Gm-Message-State: AOAM531GWurTwUf3LusHW/QkfTCTPqLZPg5Pqp5tHqr8dKXtNfrRlyHk cgD+Z8ApAwm+z1HiA32Ph3oEipbbLR/QRg== X-Google-Smtp-Source: ABdhPJzzcedWgH1/8dqYkTSQT1gOORetvtjOCBnIMwxipRXRDSXKuNdPqUE7wMwQvBZxEV5nx+pJmw== X-Received: by 2002:a1f:2591:: with SMTP id l139mr1471071vkl.5.1636570720131; Wed, 10 Nov 2021 10:58:40 -0800 (PST) Received: from birita.. ([2804:431:c7cb:55a:73fa:8bad:ab14:14a3]) by smtp.gmail.com with ESMTPSA id r20sm518149vkq.15.2021.11.10.10.58.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 10:58:39 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH 3/3] inet: Return EAI_MEMORY when nrl_domainname() fails to allocate memory Date: Wed, 10 Nov 2021 15:58:32 -0300 Message-Id: <20211110185832.1931688-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211110185832.1931688-1-adhemerval.zanella@linaro.org> References: <20211110185832.1931688-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Cc: leonardo.macchia@gmail.com Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" It aligns NI_NOFQDN with default behavior for getnameinfo(). Checked on x86_64-linux-gnu. --- inet/getnameinfo.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c index 69a94604bd..16d461428d 100644 --- a/inet/getnameinfo.c +++ b/inet/getnameinfo.c @@ -83,9 +83,11 @@ libc_freeres_ptr (static char *domain); now ignored. */ #define DEPRECATED_NI_IDN 192 -static char * +static bool nrl_domainname (void) { + int r; + __libc_lock_define_initialized (static, lock); __libc_lock_lock (lock); @@ -171,15 +173,17 @@ nrl_domainname (void) } } } + not_first = true; done: scratch_buffer_free (&tmpbuf); - not_first = true; } + r = not_first; + __libc_lock_unlock (lock); - return domain; + return r; }; /* Copy a string to a destination buffer with length checking. Return @@ -275,13 +279,17 @@ gni_host_inet_name (struct scratch_buffer *tmpbuf, if (h) { - char *c; - if ((flags & NI_NOFQDN) - && (c = nrl_domainname ()) - && (c = strstr (h->h_name, c)) - && (c != h->h_name) && (*(--c) == '.')) - /* Terminate the string after the prefix. */ - *c = '\0'; + if (flags & NI_NOFQDN) + { + if (!nrl_domainname ()) + return EAI_MEMORY; + + char *c = domain; + if (c != NULL && (c = strstr (h->h_name, c)) + && (c != h->h_name) && (*(--c) == '.')) + /* Terminate the string after the prefix. */ + *c = '\0'; + } /* If requested, convert from the IDN format. */ bool do_idn = flags & NI_IDN;