From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from alt2.a-painless.mh.aa.net.uk (painless-a.thn.aa.net.uk [IPv6:2001:8b0:0:62::26]) by sourceware.org (Postfix) with ESMTPS id 8A69F3858D35 for ; Mon, 6 May 2024 17:16:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8A69F3858D35 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=offog.org Authentication-Results: sourceware.org; spf=none smtp.mailfrom=offog.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8A69F3858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:8b0:0:62::26 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715015813; cv=none; b=dUNKQzY58bSM11l0hAFslqyl5naR84ksKLNBBzaG70TWZbZhXdRvOrPb+z5841oXs5B5SHxYo+SHLV3HsTKjhcZZm7MgawSxDxUcmTeTB/kJ3eO2qIyrRcbCklR0EYovkEZnonpXgzWM2CsdDDwTagtXzG1ZDM6iDhxvqEwBD6g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715015813; c=relaxed/simple; bh=KFmeoWrsUZupCsjuXvs6oOcxz/vsfYskHxSeCrRK2YU=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=rI0aJQpubFdnewNuo5cI2FQi+dceORQ2/tcSSdULt4eJLJj8j06x3nyfIuv/4AevnD3Lx9sEaX3nnbuJ0VflTUQPsDTItnbfCJPkFq1vdPuU4mYbOrX5e7gNhAr4CXH/Zai87yHuIY3s1dQYAO6eYLtfkNfPatDr9IB9H6cpg2s= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from cartman.offog.org ([2001:8b0:83b:b53f::a]) by painless-a.thn.aa.net.uk with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1s41xJ-004PIJ-2A for libc-alpha@sourceware.org; Mon, 06 May 2024 18:16:49 +0100 Received: from ats by cartman.offog.org with local (Exim 4.97.1) (envelope-from ) id 1s41xJ-000000007ox-1WDv; Mon, 06 May 2024 18:16:49 +0100 From: Adam Sampson To: libc-alpha@sourceware.org Cc: Adam Sampson Subject: [PATCH v2 2/2] ldconfig: Ignore all GDB extension files Date: Mon, 6 May 2024 18:16:33 +0100 Message-ID: <20240506171633.30008-3-ats@offog.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506171633.30008-1-ats@offog.org> References: <20240506171633.30008-1-ats@offog.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,KAM_LAZY_DOMAIN_SECURITY,SPF_HELO_NONE,SPF_NONE,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: ldconfig already ignores files with the -gdb.py suffix, but GDB also looks for -gdb.gdb and -gdb.scm files. These aren't as widely used, but libguile at least comes with a -gdb.scm file. Rename is_gdb_python_file to is_gdb_extension_file, and make it recognise all three types of GDB extension. Signed-off-by: Adam Sampson --- elf/readlib.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/elf/readlib.c b/elf/readlib.c index 32e8b8eb22..f3129c4557 100644 --- a/elf/readlib.c +++ b/elf/readlib.c @@ -44,12 +44,14 @@ struct known_names int flag; }; -/* Check if string corresponds to a GDB Python file. */ +/* Check if string corresponds to a GDB extension file. */ static bool -is_gdb_python_file (const char *name) +is_gdb_extension_file (const char *name) { size_t len = strlen (name); - return endswithn (name, len, "-gdb.py"); + return (endswithn (name, len, "-gdb.gdb") + || endswithn (name, len, "-gdb.py") + || endswithn (name, len, "-gdb.scm")); } /* Returns 0 if everything is ok, != 0 in case of error. */ @@ -146,7 +148,7 @@ process_file (const char *real_file_name, const char *file_name, size_t len = MIN (statbuf.st_size, 512); if (memmem (file_contents, len, "GROUP", 5) == NULL && memmem (file_contents, len, "GNU ld script", 13) == NULL - && !is_gdb_python_file (file_name)) + && !is_gdb_extension_file (file_name)) error (0, 0, _("%s is not an ELF file - it has the wrong magic bytes at the start.\n"), file_name); ret = 1; -- 2.45.0