From unknown Sun Jun 22 08:08:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#52693] [PATCH] gnu: glibc: Handle failure to find $ORIGIN. Resent-From: Ivan Kozlov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 01:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52693 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52693@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164004997018579 (code B ref -1); Tue, 21 Dec 2021 01:27:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Dec 2021 01:26:10 +0000 Received: from localhost ([127.0.0.1]:51824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzTuo-0004pY-J3 for submit@debbugs.gnu.org; Mon, 20 Dec 2021 20:26:10 -0500 Received: from lists.gnu.org ([209.51.188.17]:36978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzTuk-0004pO-Nb for submit@debbugs.gnu.org; Mon, 20 Dec 2021 20:26:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzTuk-0006oV-5q for guix-patches@gnu.org; Mon, 20 Dec 2021 20:26:02 -0500 Received: from forward401j.mail.yandex.net ([5.45.198.233]:52462) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzTuf-0005ls-VB for guix-patches@gnu.org; Mon, 20 Dec 2021 20:26:01 -0500 Received: from myt6-06c5907de372.qloud-c.yandex.net (myt6-06c5907de372.qloud-c.yandex.net [IPv6:2a02:6b8:c12:42ad:0:640:6c5:907d]) by forward401j.mail.yandex.net (Yandex) with ESMTP id 0FE4F1ACDD71 for ; Tue, 21 Dec 2021 04:25:51 +0300 (MSK) Received: from 2a02:6b8:c12:2487:0:640:27f5:8919 (2a02:6b8:c12:2487:0:640:27f5:8919 [2a02:6b8:c12:2487:0:640:27f5:8919]) by myt6-06c5907de372.qloud-c.yandex.net (mxback/Yandex) with HTTP id nPVAIG1euOs1-PoeOn0KN; Tue, 21 Dec 2021 04:25:50 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1640049950; bh=vNedbYRM0BmxtLZTQrsPEBRvufpFKdZhYPrirTd6UuM=; h=Message-Id:Date:Subject:To:From; b=LUFCZhvGFwrNL9gU5FO4bFqrf6t8jifMC1mO95ywGrEDCKtvFbj+hVBhVbX7dAuxq +9XL6DTxhKH8I7n3VjrqZRIr99lYmEFzoWsNaoK2ia6ZTnR+s+js3HnAoukf18mtT2 6zW4Nq4mHadNn9gKxRKfkkTiz4GgePAs+QKzefaA= Authentication-Results: myt6-06c5907de372.qloud-c.yandex.net; dkim=pass header.i=@yandex.ru Received: by myt6-27f58919b1c4.qloud-c.yandex.net with HTTP; Tue, 21 Dec 2021 04:25:50 +0300 From: Ivan Kozlov MIME-Version: 1.0 X-Mailer: Yamail [ http://yandex.ru ] 5.0 Date: Tue, 21 Dec 2021 04:25:50 +0300 Message-Id: <12919001640049950@myt6-27f58919b1c4.qloud-c.yandex.net> Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=utf-8 Received-SPF: pass client-ip=5.45.198.233; envelope-from=kanichos@yandex.ru; helo=forward401j.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Fixes . * gnu/packages/patches/glibc-dl-cache.patch: Check pointer returned by '_dl_get_origin' for failure indication. --- gnu/packages/patches/glibc-dl-cache.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/patches/glibc-dl-cache.patch b/gnu/packages/patches/glibc-dl-cache.patch index 68c3a94846..1535e8e9c9 100644 --- a/gnu/packages/patches/glibc-dl-cache.patch +++ b/gnu/packages/patches/glibc-dl-cache.patch @@ -3,10 +3,10 @@ from /etc/ld.so.cache. Also arrange so that this cache takes precedence over RUNPATH. diff --git a/elf/dl-cache.c b/elf/dl-cache.c -index 93d185e788..e0760a1f40 100644 +index 93d185e788..801452692d 100644 --- a/elf/dl-cache.c +++ b/elf/dl-cache.c -@@ -171,6 +171,51 @@ _dl_cache_libcmp (const char *p1, const char *p2) +@@ -171,6 +171,52 @@ _dl_cache_libcmp (const char *p1, const char *p2) return *p1 - *p2; } @@ -27,7 +27,8 @@ index 93d185e788..e0760a1f40 100644 + const char *origin = _dl_get_origin (); + + /* Check whether ORIGIN is something like "/gnu/store/…-foo/bin". */ -+ if (strncmp (store, origin, strlen (store)) == 0 ++ if (origin != (char *)-1 /* _dl_get_origin reported failure */ ++ && strncmp (store, origin, strlen (store)) == 0 + && origin[sizeof store - 1] == '/') + { + char *store_item_end = strchr (origin + sizeof store, '/'); @@ -58,7 +59,7 @@ index 93d185e788..e0760a1f40 100644 /* Look up NAME in ld.so.cache and return the file name stored there, or null if none is found. The cache is loaded if it was not already. If loading -@@ -190,12 +235,15 @@ _dl_load_cache_lookup (const char *name) +@@ -190,12 +236,15 @@ _dl_load_cache_lookup (const char *name) /* Print a message if the loading of libs is traced. */ if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) base-commit: 88b4dcdabe512992ae79a50fc333e4e463d91634 -- 2.28.0 From unknown Sun Jun 22 08:08:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#52693] [PATCH] gnu: glibc: Handle failure to find $ORIGIN. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Jan 2022 08:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52693 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ivan Kozlov Cc: 52693@debbugs.gnu.org, Maxim Cournoyer Received: via spool by 52693-submit@debbugs.gnu.org id=B52693.164214844525850 (code B ref 52693); Fri, 14 Jan 2022 08:21:01 +0000 Received: (at 52693) by debbugs.gnu.org; 14 Jan 2022 08:20:45 +0000 Received: from localhost ([127.0.0.1]:35447 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8HpF-0006is-BR for submit@debbugs.gnu.org; Fri, 14 Jan 2022 03:20:45 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:53276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8HpD-0006ia-Ts for 52693@debbugs.gnu.org; Fri, 14 Jan 2022 03:20:44 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 306C53D2; Fri, 14 Jan 2022 09:20:37 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 97--CBERL-Wr; Fri, 14 Jan 2022 09:20:36 +0100 (CET) Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 8FFC8242; Fri, 14 Jan 2022 09:20:35 +0100 (CET) From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <12919001640049950@myt6-27f58919b1c4.qloud-c.yandex.net> Date: Fri, 14 Jan 2022 09:20:34 +0100 In-Reply-To: <12919001640049950@myt6-27f58919b1c4.qloud-c.yandex.net> (Ivan Kozlov's message of "Tue, 21 Dec 2021 04:25:50 +0300") Message-ID: <87a6fy684t.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: / Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Server: hera X-Rspamd-Queue-Id: 306C53D2 X-Spamd-Result: default: False [0.90 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com,yandex.ru]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; SUBJECT_HAS_CURRENCY(1.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_TO(0.00)[yandex.ru]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FREEMAIL_CC(0.00)[debbugs.gnu.org,gmail.com] X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hello, Ivan Kozlov skribis: > Fixes . > > * gnu/packages/patches/glibc-dl-cache.patch: Check pointer returned by '_= dl_get_origin' for failure indication. Perfect, thank you Ivan. Maxim, should we include it in =E2=80=98version-1.4.0=E2=80=99? I=E2=80=99m fine either way (it=E2=80=99s a much welcome fix but it=E2=80= =99s not critical IMO). Ludo=E2=80=99. From unknown Sun Jun 22 08:08:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#52693] [PATCH] gnu: glibc: Handle failure to find $ORIGIN. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Jan 2022 22:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52693 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 52693@debbugs.gnu.org, Ivan Kozlov Received: via spool by 52693-submit@debbugs.gnu.org id=B52693.164220005531021 (code B ref 52693); Fri, 14 Jan 2022 22:41:01 +0000 Received: (at 52693) by debbugs.gnu.org; 14 Jan 2022 22:40:55 +0000 Received: from localhost ([127.0.0.1]:38510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8VFe-00084H-UU for submit@debbugs.gnu.org; Fri, 14 Jan 2022 17:40:55 -0500 Received: from mail-qv1-f54.google.com ([209.85.219.54]:41623) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8VFc-000840-Hg for 52693@debbugs.gnu.org; Fri, 14 Jan 2022 17:40:53 -0500 Received: by mail-qv1-f54.google.com with SMTP id hu2so11473814qvb.8 for <52693@debbugs.gnu.org>; Fri, 14 Jan 2022 14:40:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=0MObIfq9yUEQYNzIUC1ZCpsNvKIhFI5c5Y77t3RXu80=; b=lFLElekHoSIek5SQeoG/jDtpltLzWUakdpprlW5NXuckG10hq4zThvzG/JXY+eiL/W ad26zRW+b1/V5YkASYwtvFkIrbb46WSG/K4lcPw7X048SzcXo6EUnVah8EotgbYGVJ49 ULke9mNxUv424A+jy6rfcYHqcrWw9kys9bhl8O+Vzhofd1nrrQMYUUzSYowpVXcYYLpf ekKq4ntF4QxoHH8UQ2KHNZ60bWEuDTtTb9unduIjvvL8YyleZ/aYs2MvDixae+K9Xn2n MnDWucx3XA+HPRuOLwAb1YxpyEqLgvzBA+urkl775aDzgH/ESfRGLv4tafj7R6NNJpvt sA3w== 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:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=0MObIfq9yUEQYNzIUC1ZCpsNvKIhFI5c5Y77t3RXu80=; b=sovIHwzbhA4lZhkTCZMexCYcF7wU2V9M53RQetJQVB01RTDvPB9BmnnaZ3FBO77Eoo M/NnDiZB+npooIaD0UeqMImn3RnRYUsiPxmwtbkdatzCs5q+2sDRihAzM/8S0HV1VGzT VCXbduaNHiIyifq7BiVstV3oMLaGNa30oiNBK8tTMF2y6jqMbts6UuSmLjruAbwWiMad w7aSDrXaK6RYkxjR5qw163kC4gur+TRL0V6KBfUDZt2BzcGulVY8TfqPdyr+oTN5DkxW e5g9sK8SGfUZhtoYLot0uA/NA+nmRW7CzkV8Z3YKB9akdSKhuO7VFFRlmrqKTHGWcCHW SCzw== X-Gm-Message-State: AOAM532hEk4M2wqBv4r4/0edgfelwSZbu7ocjd0NK5QYJ46mQUefyHCi p4AdD1s5Zhos28tOXZnRebLNOSHbv4U= X-Google-Smtp-Source: ABdhPJzfiRbnuIt1WnFdQWO/7dc4H6Lm5ojRExBm2JDUAlO6oI9xSWxzh1Jnt7+f9gdNBd/RYyz8RQ== X-Received: by 2002:a05:6214:300b:: with SMTP id ke11mr10250029qvb.8.1642200046726; Fri, 14 Jan 2022 14:40:46 -0800 (PST) Received: from hurd (dsl-152-155.b2b2c.ca. [66.158.152.155]) by smtp.gmail.com with ESMTPSA id d10sm555071qtb.63.2022.01.14.14.40.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jan 2022 14:40:46 -0800 (PST) From: Maxim Cournoyer References: <12919001640049950@myt6-27f58919b1c4.qloud-c.yandex.net> <87a6fy684t.fsf@gnu.org> Date: Fri, 14 Jan 2022 17:40:44 -0500 In-Reply-To: <87a6fy684t.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Fri, 14 Jan 2022 09:20:34 +0100") Message-ID: <87wnj29c0j.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Ludovic Court=C3=A8s writes: > Hello, > > Ivan Kozlov skribis: > >> Fixes . >> >> * gnu/packages/patches/glibc-dl-cache.patch: Check pointer returned >> by '_dl_get_origin' for failure indication. Is this a world rebuilding change? If so, I'm afraid it'll have to wait until the next rebuild cycle comes as we're already far into building the version-1.4.0 branch. Thanks, Maxim From unknown Sun Jun 22 08:08:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#52693] [PATCH] gnu: glibc: Handle failure to find $ORIGIN. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Jan 2022 15:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52693 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: 52693@debbugs.gnu.org, Ivan Kozlov Received: via spool by 52693-submit@debbugs.gnu.org id=B52693.164243159631782 (code B ref 52693); Mon, 17 Jan 2022 15:00:02 +0000 Received: (at 52693) by debbugs.gnu.org; 17 Jan 2022 14:59:56 +0000 Received: from localhost ([127.0.0.1]:47388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n9TUC-0008GX-53 for submit@debbugs.gnu.org; Mon, 17 Jan 2022 09:59:56 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:45640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n9TU9-0008GH-SE for 52693@debbugs.gnu.org; Mon, 17 Jan 2022 09:59:55 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id A4DE92D2; Mon, 17 Jan 2022 15:59:47 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bWDvK9NBh4_K; Mon, 17 Jan 2022 15:59:46 +0100 (CET) Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 65EEE29C; Mon, 17 Jan 2022 15:59:46 +0100 (CET) From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <12919001640049950@myt6-27f58919b1c4.qloud-c.yandex.net> <87a6fy684t.fsf@gnu.org> <87wnj29c0j.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 28 =?UTF-8?Q?Niv=C3=B4se?= an 230 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 17 Jan 2022 15:59:45 +0100 In-Reply-To: <87wnj29c0j.fsf@gmail.com> (Maxim Cournoyer's message of "Fri, 14 Jan 2022 17:40:44 -0500") Message-ID: <875yqio1b2.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: / Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Server: hera X-Rspamd-Queue-Id: A4DE92D2 X-Spamd-Result: default: False [0.90 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; FREEMAIL_ENVRCPT(0.00)[gmail.com,yandex.ru]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; SUBJECT_HAS_CURRENCY(1.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FREEMAIL_CC(0.00)[yandex.ru,debbugs.gnu.org] X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hi, Maxim Cournoyer skribis: > Ludovic Court=C3=A8s writes: > >> Hello, >> >> Ivan Kozlov skribis: >> >>> Fixes . >>> >>> * gnu/packages/patches/glibc-dl-cache.patch: Check pointer returned >>> by '_dl_get_origin' for failure indication. > > Is this a world rebuilding change? Yes. > If so, I'm afraid it'll have to wait until the next rebuild cycle > comes as we're already far into building the version-1.4.0 branch. Sounds good, no worries. Thanks, Ludo=E2=80=99. From unknown Sun Jun 22 08:08:05 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Ivan Kozlov Subject: bug#52693: closed (Re: bug#52693: [PATCH] gnu: glibc: Handle failure to find $ORIGIN.) Message-ID: References: <878rhk3ofj.fsf@gnu.org> <12919001640049950@myt6-27f58919b1c4.qloud-c.yandex.net> X-Gnu-PR-Message: they-closed 52693 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 52693@debbugs.gnu.org Date: Sun, 29 Jan 2023 23:35:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1675035302-23157-1" This is a multi-part message in MIME format... ------------=_1675035302-23157-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #52693: [PATCH] gnu: glibc: Handle failure to find $ORIGIN. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 52693@debbugs.gnu.org. --=20 52693: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D52693 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1675035302-23157-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 52693-done) by debbugs.gnu.org; 29 Jan 2023 23:34:52 +0000 Received: from localhost ([127.0.0.1]:45580 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMHCF-00060l-JA for submit@debbugs.gnu.org; Sun, 29 Jan 2023 18:34:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57688) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMHCD-00060T-FN; Sun, 29 Jan 2023 18:34:49 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMHC7-0000Fn-FS; Sun, 29 Jan 2023 18:34:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=vwFuPQubiAFoOrCB/8B/G+b3sYN4lILRQtLSJ4D3aIw=; b=qHq11Im6KRlOHC+/PqrR CXLxwbe1bkVSMt2+8yRfrnvlvuGgRq0rPczfaYC+HrqzuhXzUj12xcKXZUbIaHEnA8S1gLNfkPy9A mrKJ4ntCFO4B2NWThbcD3wRFARhpXBjkRGInlDquI2SfdRqhnGUd0UANRb9Nx3S7sw/CX0UcMEEj3 3wZUTZmXcDNiZODOSIkvi9fnjqbxDbfYT/GiwZnsdFJfRjCos9nl8P691OpubpTzQbo/ktE3HNSf8 GxNzXj8lbTI9wltB2Ix+KVS6ll2SWPm+MxFdGLO3GHdMQhKbrNFU7MQ989NpGBsfCCiK2ZpzxNlDo vK1Bghd++UC2Tg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMHC7-0000t8-0b; Sun, 29 Jan 2023 18:34:43 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Ivan Kozlov Subject: Re: bug#52693: [PATCH] gnu: glibc: Handle failure to find $ORIGIN. References: <12919001640049950@myt6-27f58919b1c4.qloud-c.yandex.net> Date: Mon, 30 Jan 2023 00:34:40 +0100 In-Reply-To: <12919001640049950@myt6-27f58919b1c4.qloud-c.yandex.net> (Ivan Kozlov's message of "Tue, 21 Dec 2021 04:25:50 +0300") Message-ID: <878rhk3ofj.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 52693-done Cc: 52693-done@debbugs.gnu.org, 52671-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Ivan, Ivan Kozlov skribis: > Fixes . > > * gnu/packages/patches/glibc-dl-cache.patch: Check pointer returned by '_= dl_get_origin' for failure indication. Somehow we forgot about this patch for a whole year, and it turns out I stumbled upon the bug again just hours ago=C2=B9. Now pushed to =E2=80=98core-updates=E2=80=99 as edb8c09addd186d9538d43b12af74d6c7aeea082. Thanks again, and apologies for the delay! Ludo=E2=80=99. =C2=B9 https://issues.guix.gnu.org/61156 ------------=_1675035302-23157-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 21 Dec 2021 01:26:10 +0000 Received: from localhost ([127.0.0.1]:51824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzTuo-0004pY-J3 for submit@debbugs.gnu.org; Mon, 20 Dec 2021 20:26:10 -0500 Received: from lists.gnu.org ([209.51.188.17]:36978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzTuk-0004pO-Nb for submit@debbugs.gnu.org; Mon, 20 Dec 2021 20:26:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzTuk-0006oV-5q for guix-patches@gnu.org; Mon, 20 Dec 2021 20:26:02 -0500 Received: from forward401j.mail.yandex.net ([5.45.198.233]:52462) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzTuf-0005ls-VB for guix-patches@gnu.org; Mon, 20 Dec 2021 20:26:01 -0500 Received: from myt6-06c5907de372.qloud-c.yandex.net (myt6-06c5907de372.qloud-c.yandex.net [IPv6:2a02:6b8:c12:42ad:0:640:6c5:907d]) by forward401j.mail.yandex.net (Yandex) with ESMTP id 0FE4F1ACDD71 for ; Tue, 21 Dec 2021 04:25:51 +0300 (MSK) Received: from 2a02:6b8:c12:2487:0:640:27f5:8919 (2a02:6b8:c12:2487:0:640:27f5:8919 [2a02:6b8:c12:2487:0:640:27f5:8919]) by myt6-06c5907de372.qloud-c.yandex.net (mxback/Yandex) with HTTP id nPVAIG1euOs1-PoeOn0KN; Tue, 21 Dec 2021 04:25:50 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1640049950; bh=vNedbYRM0BmxtLZTQrsPEBRvufpFKdZhYPrirTd6UuM=; h=Message-Id:Date:Subject:To:From; b=LUFCZhvGFwrNL9gU5FO4bFqrf6t8jifMC1mO95ywGrEDCKtvFbj+hVBhVbX7dAuxq +9XL6DTxhKH8I7n3VjrqZRIr99lYmEFzoWsNaoK2ia6ZTnR+s+js3HnAoukf18mtT2 6zW4Nq4mHadNn9gKxRKfkkTiz4GgePAs+QKzefaA= Authentication-Results: myt6-06c5907de372.qloud-c.yandex.net; dkim=pass header.i=@yandex.ru Received: by myt6-27f58919b1c4.qloud-c.yandex.net with HTTP; Tue, 21 Dec 2021 04:25:50 +0300 From: Ivan Kozlov To: guix-patches@gnu.org Subject: [PATCH] gnu: glibc: Handle failure to find $ORIGIN. MIME-Version: 1.0 X-Mailer: Yamail [ http://yandex.ru ] 5.0 Date: Tue, 21 Dec 2021 04:25:50 +0300 Message-Id: <12919001640049950@myt6-27f58919b1c4.qloud-c.yandex.net> Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=utf-8 Received-SPF: pass client-ip=5.45.198.233; envelope-from=kanichos@yandex.ru; helo=forward401j.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Fixes . * gnu/packages/patches/glibc-dl-cache.patch: Check pointer returned by '_dl_get_origin' for failure indication. --- gnu/packages/patches/glibc-dl-cache.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/patches/glibc-dl-cache.patch b/gnu/packages/patches/glibc-dl-cache.patch index 68c3a94846..1535e8e9c9 100644 --- a/gnu/packages/patches/glibc-dl-cache.patch +++ b/gnu/packages/patches/glibc-dl-cache.patch @@ -3,10 +3,10 @@ from /etc/ld.so.cache. Also arrange so that this cache takes precedence over RUNPATH. diff --git a/elf/dl-cache.c b/elf/dl-cache.c -index 93d185e788..e0760a1f40 100644 +index 93d185e788..801452692d 100644 --- a/elf/dl-cache.c +++ b/elf/dl-cache.c -@@ -171,6 +171,51 @@ _dl_cache_libcmp (const char *p1, const char *p2) +@@ -171,6 +171,52 @@ _dl_cache_libcmp (const char *p1, const char *p2) return *p1 - *p2; } @@ -27,7 +27,8 @@ index 93d185e788..e0760a1f40 100644 + const char *origin = _dl_get_origin (); + + /* Check whether ORIGIN is something like "/gnu/store/…-foo/bin". */ -+ if (strncmp (store, origin, strlen (store)) == 0 ++ if (origin != (char *)-1 /* _dl_get_origin reported failure */ ++ && strncmp (store, origin, strlen (store)) == 0 + && origin[sizeof store - 1] == '/') + { + char *store_item_end = strchr (origin + sizeof store, '/'); @@ -58,7 +59,7 @@ index 93d185e788..e0760a1f40 100644 /* Look up NAME in ld.so.cache and return the file name stored there, or null if none is found. The cache is loaded if it was not already. If loading -@@ -190,12 +235,15 @@ _dl_load_cache_lookup (const char *name) +@@ -190,12 +236,15 @@ _dl_load_cache_lookup (const char *name) /* Print a message if the loading of libs is traced. */ if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) base-commit: 88b4dcdabe512992ae79a50fc333e4e463d91634 -- 2.28.0 ------------=_1675035302-23157-1--