From patchwork Fri Nov 12 14:21:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 47527 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 C0E3A385800D for ; Fri, 12 Nov 2021 14:22:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C0E3A385800D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1636726942; bh=Lz3QbDTDHHGeG4Pb5D+gU9VZBhkDT0aIO+TB70kRLlQ=; 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=BURl+RqoEBOv8xiduN/SedIJ40U2Jz5C4lwEcX09dIGa5pH7QQE0PUadlJUhQC55y ++JhFfW+wMtJ6PBrfjRmfe9IdoKcLnb1GF6sr6rlXKhFbW4jD9tqfjRZ/N7Csz2+3A ADpiHZHmYfdj3evNKKSi2HcTM1NmSsMqqC1iuPXM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ua1-x929.google.com (mail-ua1-x929.google.com [IPv6:2607:f8b0:4864:20::929]) by sourceware.org (Postfix) with ESMTPS id 827FA3858402 for ; Fri, 12 Nov 2021 14:21:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 827FA3858402 Received: by mail-ua1-x929.google.com with SMTP id az37so19060725uab.13 for ; Fri, 12 Nov 2021 06:21:20 -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=Lz3QbDTDHHGeG4Pb5D+gU9VZBhkDT0aIO+TB70kRLlQ=; b=eZMiFa/zfikZhqdlVWiVIs069rl4rGssyJWruL7Eg5nUjcQ/Pdzu5Bj0nJemL81zbU w5tGHqwwjAY+XS78YItpFreXjsR4ldQJNIFuJrc9RE3HGzWTlZofEItT64k2IUbYm5DZ 6CtguNUf7f//nJf3um10IO03WOQ6J+qpaHwydfHbSTNW8UtWNyy5TzzHq9b3gk2CS6N+ ONfWluWVy9+55GWC9brcfrY0Fmms4o3XJHKXiZuNevzd+rHfMHkZxK9q1xX3pkkpQVr1 IwLd2zAZcbtBztx/cB+IKQkDa4XgaF5L4h7De/0rUfuhYRl6jj6GA79X/atg1bO+2FCE nAjw== X-Gm-Message-State: AOAM533luIvj5speffEeqxAiRv5zQjo4iCNZaTEvKAHyK5HMley2F33q pdyouGsLAumYUX1GsDbB2ATgEGL9iCzVuA== X-Google-Smtp-Source: ABdhPJzQSVrKo2EVcDotMxNZO7JdHHkNg1OdsrMJ26ZqF63H8DxITFFXk2cc9DOpyaCuVgiF02B2vw== X-Received: by 2002:a05:6102:3a0c:: with SMTP id b12mr3857336vsu.31.1636726879847; Fri, 12 Nov 2021 06:21:19 -0800 (PST) Received: from birita.. ([2804:431:c7cb:55a:ec9e:6037:1db6:e51]) by smtp.gmail.com with ESMTPSA id z188sm3902946vsz.12.2021.11.12.06.21.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Nov 2021 06:21:19 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 1/3] inet: Fix getnameinfo (NI_NOFQDN) race condition (BZ#28566) Date: Fri, 12 Nov 2021 11:21:12 -0300 Message-Id: <20211112142114.239913-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211112142114.239913-1-adhemerval.zanella@linaro.org> References: <20211112142114.239913-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" The 'not_first' is accessed on nrl_domainname() in a non atomically way, although it is only updated after the lock is taken. This patch fix the double-checked locking by using acquire-release atomic operation instead of plain load and by moving the 'not_first' store only after 'domain' is actually set. Checked on x86_64-linux-gnu. --- inet/getnameinfo.c | 148 ++++++++++++++++++++++++--------------------- 1 file changed, 78 insertions(+), 70 deletions(-) diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c index 8380d85783..5eee354200 100644 --- a/inet/getnameinfo.c +++ b/inet/getnameinfo.c @@ -83,104 +83,112 @@ libc_freeres_ptr (static char *domain); now ignored. */ #define DEPRECATED_NI_IDN 192 -static char * -nrl_domainname (void) +static void +nrl_domainname_core (struct scratch_buffer *tmpbuf) { - static int not_first; + char *c; + struct hostent *h, th; + int herror; - if (! not_first) + while (__gethostbyname_r ("localhost", &th, + tmpbuf->data, tmpbuf->length, + &h, &herror)) { - __libc_lock_define_initialized (static, lock); - __libc_lock_lock (lock); - - if (! not_first) + if (herror == NETDB_INTERNAL && errno == ERANGE) { - char *c; - struct hostent *h, th; - int herror; - struct scratch_buffer tmpbuf; - - scratch_buffer_init (&tmpbuf); - not_first = 1; + if (!scratch_buffer_grow (tmpbuf)) + return; + } + else + break; + } - while (__gethostbyname_r ("localhost", &th, - tmpbuf.data, tmpbuf.length, + if (h != NULL && (c = strchr (h->h_name, '.')) != NULL) + domain = __strdup (++c); + else + { + /* The name contains no domain information. Use the name + now to get more information. */ + while (__gethostname (tmpbuf->data, tmpbuf->length)) + if (!scratch_buffer_grow (tmpbuf)) + return; + + if ((c = strchr (tmpbuf->data, '.')) != NULL) + domain = __strdup (++c); + else + { + /* We need to preserve the hostname. */ + const char *hstname = strdupa (tmpbuf->data); + while (__gethostbyname_r (hstname, &th, + tmpbuf->data, + tmpbuf->length, &h, &herror)) { if (herror == NETDB_INTERNAL && errno == ERANGE) { - if (!scratch_buffer_grow (&tmpbuf)) - goto done; + if (!scratch_buffer_grow (tmpbuf)) + return; } else break; } - if (h && (c = strchr (h->h_name, '.'))) + if (h != NULL && (c = strchr(h->h_name, '.')) != NULL) domain = __strdup (++c); else { - /* The name contains no domain information. Use the name - now to get more information. */ - while (__gethostname (tmpbuf.data, tmpbuf.length)) - if (!scratch_buffer_grow (&tmpbuf)) - goto done; + struct in_addr in_addr; - if ((c = strchr (tmpbuf.data, '.'))) - domain = __strdup (++c); - else - { - /* We need to preserve the hostname. */ - const char *hstname = strdupa (tmpbuf.data); + in_addr.s_addr = htonl (INADDR_LOOPBACK); - while (__gethostbyname_r (hstname, &th, - tmpbuf.data, tmpbuf.length, - &h, &herror)) + while (__gethostbyaddr_r ((const char *) &in_addr, + sizeof (struct in_addr), + AF_INET, &th, + tmpbuf->data, + tmpbuf->length, + &h, &herror)) + { + if (herror == NETDB_INTERNAL && errno == ERANGE) { - if (herror == NETDB_INTERNAL && errno == ERANGE) - { - if (!scratch_buffer_grow (&tmpbuf)) - goto done; - } - else - break; + if (!scratch_buffer_grow (tmpbuf)) + return; } - - if (h && (c = strchr(h->h_name, '.'))) - domain = __strdup (++c); else - { - struct in_addr in_addr; - - in_addr.s_addr = htonl (INADDR_LOOPBACK); - - while (__gethostbyaddr_r ((const char *) &in_addr, - sizeof (struct in_addr), - AF_INET, &th, - tmpbuf.data, tmpbuf.length, - &h, &herror)) - { - if (herror == NETDB_INTERNAL && errno == ERANGE) - { - if (!scratch_buffer_grow (&tmpbuf)) - goto done; - } - else - break; - } - - if (h && (c = strchr (h->h_name, '.'))) - domain = __strdup (++c); - } + break; } + + if (h != NULL && (c = strchr (h->h_name, '.')) != NULL) + domain = __strdup (++c); } - done: - scratch_buffer_free (&tmpbuf); } + } +} - __libc_lock_unlock (lock); +static char * +nrl_domainname (void) +{ + static int not_first; + + if (__glibc_likely (atomic_load_acquire (¬_first) != 0)) + return domain; + + __libc_lock_define_initialized (static, lock); + __libc_lock_lock (lock); + + if (atomic_load_relaxed (¬_first) == 0) + { + struct scratch_buffer tmpbuf; + scratch_buffer_init (&tmpbuf); + + nrl_domainname_core (&tmpbuf); + + scratch_buffer_free (&tmpbuf); + + atomic_store_release (¬_first, 1); } + __libc_lock_unlock (lock); + return domain; }; From patchwork Fri Nov 12 14:21:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 47528 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 340633858030 for ; Fri, 12 Nov 2021 14:23:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 340633858030 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1636726985; bh=mj46Gqt6Cm0Er3p7GuzZXhAKypiyWs4l6fjNYsPmnPM=; 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=LmU2GffuoSJeyji1qHcVg8HCHRxKSfHQxn2BweUlyA2eniAGi2lHZuV+Fm7n4zitO IbyzzVWoQkVttZax6tDjiVoSaupdOExS2dBabGhjg8mo/A9rX7WkuhZ8QGypID8idd PfEXieQhrhXjKdyMCzoX0QwMIzOk0/JD27OQiuqI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ua1-x92f.google.com (mail-ua1-x92f.google.com [IPv6:2607:f8b0:4864:20::92f]) by sourceware.org (Postfix) with ESMTPS id 9F826385841B for ; Fri, 12 Nov 2021 14:21:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9F826385841B Received: by mail-ua1-x92f.google.com with SMTP id t13so19085571uad.9 for ; Fri, 12 Nov 2021 06:21:21 -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=mj46Gqt6Cm0Er3p7GuzZXhAKypiyWs4l6fjNYsPmnPM=; b=ZZJ6jgFoTf3Cxt9yIMk3XkK+dzFEpNip4zbgpLSgfkQ3PY4mpoiWjPEPfdiJ6eta2A tuCxDQ6thgIliPEoFvvQ7MHrCL7wxZKUfpETZtHsoGJU8qIBYbPDNNy8Ovyx9b5/pE9d CIEfbYN+rVpLrw1hzJ49NdGTRk1PaWQjZ04R9+SMHQTHOX2UqAvYBj2rbtprwzt3v1Cq CTEgCoUIiqjLO5AGGuEXbcKojGnvygqIbcxQgVxEAdaJo+0M9ikhmFO+TFVLQQ+fevuJ OAk9TaTxx5Mpifba5JLGMh4Vj8YYN0KTHRgKvI9UdqN/hXXX5DFUX4jvSNKM+tCYtHEd AGdg== X-Gm-Message-State: AOAM532melN1OJPtPU/0frXmpmeo+QgH9ECmESHqLBM262L78FY1OB51 xBv/9tbOOBf9/ZL3NnNfepVOKHmqektsvw== X-Google-Smtp-Source: ABdhPJyWyNr25XYaE6crARopu2AA3+deJvZDYyipp/I+7QloB0clx9nresT5yvhROwtN3LuzoheQfQ== X-Received: by 2002:a67:c890:: with SMTP id v16mr10498855vsk.4.1636726881080; Fri, 12 Nov 2021 06:21:21 -0800 (PST) Received: from birita.. ([2804:431:c7cb:55a:ec9e:6037:1db6:e51]) by smtp.gmail.com with ESMTPSA id z188sm3902946vsz.12.2021.11.12.06.21.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Nov 2021 06:21:20 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 2/3] inet: Remove strdupa from nrl_domainname() Date: Fri, 12 Nov 2021 11:21:13 -0300 Message-Id: <20211112142114.239913-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211112142114.239913-1-adhemerval.zanella@linaro.org> References: <20211112142114.239913-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 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" We can use the already in place scratch_buffer. Checked on x86_64-linux-gnu. --- inet/getnameinfo.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c index 5eee354200..2d2397e7dc 100644 --- a/inet/getnameinfo.c +++ b/inet/getnameinfo.c @@ -118,15 +118,15 @@ nrl_domainname_core (struct scratch_buffer *tmpbuf) else { /* We need to preserve the hostname. */ - const char *hstname = strdupa (tmpbuf->data); - while (__gethostbyname_r (hstname, &th, - tmpbuf->data, - tmpbuf->length, + size_t hstnamelen = strlen (tmpbuf->data) + 1; + while (__gethostbyname_r (tmpbuf->data, &th, + tmpbuf->data + hstnamelen, + tmpbuf->length - hstnamelen, &h, &herror)) { if (herror == NETDB_INTERNAL && errno == ERANGE) { - if (!scratch_buffer_grow (tmpbuf)) + if (!scratch_buffer_grow_preserve (tmpbuf)) return; } else From patchwork Fri Nov 12 14:21:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 47529 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 DC2D53858024 for ; Fri, 12 Nov 2021 14:23:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DC2D53858024 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1636727032; bh=nAjnyyrqf77jbojovTBL3O1Dv+ZrTWW11/yJjE2OdEU=; 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=E5XbnnsPBZHtzLa0Ug4eX0CvqnaYL4HSiGxJSD9ag9YzkcYas4GVadcoxsVCgpHda 1w+W32MQOHaiy9YldUae67AqdnbAxgJmZuYF0f3BZWxBk5xK9xqz/rVdwdQYjtt9PD TrigULnpVTiTEO5pD+6mUA67aqr/suoISHrVlMa4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-vk1-xa30.google.com (mail-vk1-xa30.google.com [IPv6:2607:f8b0:4864:20::a30]) by sourceware.org (Postfix) with ESMTPS id A0A6C385800F for ; Fri, 12 Nov 2021 14:21:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A0A6C385800F Received: by mail-vk1-xa30.google.com with SMTP id 84so5196023vkc.6 for ; Fri, 12 Nov 2021 06:21:23 -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=nAjnyyrqf77jbojovTBL3O1Dv+ZrTWW11/yJjE2OdEU=; b=OylImLL2hV+kmJqQ90Sym9SIw4U/VnyYO/zLsWBYJ6OcW2eUonZlA7aZnK7XR7nVCS CbDz+svgdrArew3vqX7LHtFthMezC7TrDheWkgTks7PmPBeQoIBdDmVwJM20z8577WbW CXQw7HBmzQnmfhaCz2s4WVJhD/kTExOAsk+V+31KNRgGfnDvDbpSu3PN5s/O/bNfhOza SMNKl9SSjRG5Mey4tmYryNTeidU7cW0oJ96hInRiTBxPb7gR3C0HUReL6HzCRYjwMucD IDt1vcbMF7q67P9TMQO+bUbxxdhAWEzDWZ4TVbAIXBinFCGt9mgNd/iaK2/YaybJZa8K 3jrA== X-Gm-Message-State: AOAM533tLIq68N0VQg00phye0nPxh9vOtg9UGcuUCLFER+oI6S1vFu8U sM6GCJY3FHLHKRgfQ4MPnqV0NZKrlof2/w== X-Google-Smtp-Source: ABdhPJycWK19gEaJWkEAKmYh26CLPqgkpUiy0LuJoAVp8JaGIrBntqeZka3L7u6ynpyMxoKxEwzreg== X-Received: by 2002:a1f:a046:: with SMTP id j67mr23869982vke.17.1636726882378; Fri, 12 Nov 2021 06:21:22 -0800 (PST) Received: from birita.. ([2804:431:c7cb:55a:ec9e:6037:1db6:e51]) by smtp.gmail.com with ESMTPSA id z188sm3902946vsz.12.2021.11.12.06.21.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Nov 2021 06:21:22 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 3/3] inet: Return EAI_MEMORY when nrl_domainname() fails to allocate memory Date: Fri, 12 Nov 2021 11:21:14 -0300 Message-Id: <20211112142114.239913-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211112142114.239913-1-adhemerval.zanella@linaro.org> References: <20211112142114.239913-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 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, UNWANTED_LANGUAGE_BODY 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 | 55 +++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c index 2d2397e7dc..2bec3263fc 100644 --- a/inet/getnameinfo.c +++ b/inet/getnameinfo.c @@ -83,7 +83,7 @@ libc_freeres_ptr (static char *domain); now ignored. */ #define DEPRECATED_NI_IDN 192 -static void +static bool nrl_domainname_core (struct scratch_buffer *tmpbuf) { char *c; @@ -97,7 +97,7 @@ nrl_domainname_core (struct scratch_buffer *tmpbuf) if (herror == NETDB_INTERNAL && errno == ERANGE) { if (!scratch_buffer_grow (tmpbuf)) - return; + return false; } else break; @@ -111,10 +111,13 @@ nrl_domainname_core (struct scratch_buffer *tmpbuf) now to get more information. */ while (__gethostname (tmpbuf->data, tmpbuf->length)) if (!scratch_buffer_grow (tmpbuf)) - return; + return false; if ((c = strchr (tmpbuf->data, '.')) != NULL) - domain = __strdup (++c); + { + domain = __strdup (++c); + return domain != NULL; + } else { /* We need to preserve the hostname. */ @@ -127,14 +130,17 @@ nrl_domainname_core (struct scratch_buffer *tmpbuf) if (herror == NETDB_INTERNAL && errno == ERANGE) { if (!scratch_buffer_grow_preserve (tmpbuf)) - return; + return false; } else break; } if (h != NULL && (c = strchr(h->h_name, '.')) != NULL) - domain = __strdup (++c); + { + domain = __strdup (++c); + return domain != NULL; + } else { struct in_addr in_addr; @@ -151,20 +157,24 @@ nrl_domainname_core (struct scratch_buffer *tmpbuf) if (herror == NETDB_INTERNAL && errno == ERANGE) { if (!scratch_buffer_grow (tmpbuf)) - return; + return false; } else break; } if (h != NULL && (c = strchr (h->h_name, '.')) != NULL) - domain = __strdup (++c); + { + domain = __strdup (++c); + return domain != NULL; + } } } } + return true; } -static char * +static bool nrl_domainname (void) { static int not_first; @@ -172,6 +182,8 @@ nrl_domainname (void) if (__glibc_likely (atomic_load_acquire (¬_first) != 0)) return domain; + int r = true; + __libc_lock_define_initialized (static, lock); __libc_lock_lock (lock); @@ -180,16 +192,15 @@ nrl_domainname (void) struct scratch_buffer tmpbuf; scratch_buffer_init (&tmpbuf); - nrl_domainname_core (&tmpbuf); + if ((r = nrl_domainname_core (&tmpbuf))) + atomic_store_release (¬_first, 1); scratch_buffer_free (&tmpbuf); - - atomic_store_release (¬_first, 1); } __libc_lock_unlock (lock); - return domain; + return r; }; /* Copy a string to a destination buffer with length checking. Return @@ -285,13 +296,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;