From: John Millikin <john@john-millikin.com>
To: x86@kernel.org, linux-kernel@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
John Millikin <john@john-millikin.com>
Subject: [PATCH] x86/tools: Use POSIX-compliant syntax for empty regex groups
Date: Fri, 25 Dec 2020 22:30:43 +0900 [thread overview]
Message-ID: <ed1d5611-a0e6-7629-c827-a17112944c5f@john-millikin.com> (raw)
The syntax for POSIX regexes technically doesn't allow empty branches in
conditional match groups. GNU libc accepts them as equivalent to `()',
but other libc implementations (e.g. macOS libc) reject them with a
parse error.
Changing to compliant syntax, `(|_sym)' to `(()|_sym)', lets the `relocs'
tool run successfully when using a non-GNU platform as a build host for
cross-compiling the kernel.
Signed-off-by: John Millikin <john@john-millikin.com>
---
Helper binary to verify behavior for the current platform:
#include <regex.h>
#include <stdio.h>
int main(int argc, char **argv) {
regex_t compiled;
int err = regcomp(&compiled, argv[1], REG_EXTENDED|REG_NOSUB);
if (err != 0) {
char errbuf[128];
regerror(err, &compiled, errbuf, sizeof(errbuf));
printf("regcomp(\"%s\"): %s\n", argv[1], errbuf);
return 1;
}
printf("regcomp(\"%s\"): OK\n", argv[1]);
return 0;
}
Output from GNU libc 2.28 and a fussier non-GNU libc:
debian:~$ ./regcomp '^a(|b)$'
regcomp("^a(|b)$"): OK
debian:~$ ./regcomp '^a(()|b)$'
regcomp("^a(()|b)$"): OK
darwin:~$ ./regcomp '^a(|b)$'
regcomp("^a(|b)$"): empty (sub)expression
darwin:~$ ./regcomp '^a(()|b)$'
regcomp("^a(()|b)$"): OK
arch/x86/tools/relocs.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
index ce7188cbdae5..e6f28616a625 100644
--- a/arch/x86/tools/relocs.c
+++ b/arch/x86/tools/relocs.c
@@ -57,12 +57,12 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = {
[S_REL] =
"^(__init_(begin|end)|"
"__x86_cpu_dev_(start|end)|"
- "(__parainstructions|__alt_instructions)(|_end)|"
- "(__iommu_table|__apicdrivers|__smp_locks)(|_end)|"
+ "(__parainstructions|__alt_instructions)(()|_end)|"
+ "(__iommu_table|__apicdrivers|__smp_locks)(()|_end)|"
"__(start|end)_pci_.*|"
"__(start|end)_builtin_fw|"
- "__(start|stop)___ksymtab(|_gpl|_unused|_unused_gpl|_gpl_future)|"
- "__(start|stop)___kcrctab(|_gpl|_unused|_unused_gpl|_gpl_future)|"
+ "__(start|stop)___ksymtab(()|_gpl|_unused|_unused_gpl|_gpl_future)|"
+ "__(start|stop)___kcrctab(()|_gpl|_unused|_unused_gpl|_gpl_future)|"
"__(start|stop)___param|"
"__(start|stop)___modver|"
"__(start|stop)___bug_table|"
--
2.29.2
next reply other threads:[~2020-12-25 13:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-25 13:30 John Millikin [this message]
2021-02-03 12:08 ` [PATCH] x86/tools: Use POSIX-compliant syntax for empty regex groups Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ed1d5611-a0e6-7629-c827-a17112944c5f@john-millikin.com \
--to=john@john-millikin.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).