Andrew Lukoshko
0eab958d1f
Add the RHEL 211.21.1..211.22.1 backports (1288-1351) from centos-stream-10 and upstream stable, on top of 211.20.1. Bump pkgrelease and specrelease to 211.22.1. (The redhat/ automotive rebuild-changelog tooling change is omitted: it patches redhat/scripts not present in this build base and does not affect the kernel.)
66 lines
2.5 KiB
Diff
66 lines
2.5 KiB
Diff
From 8b98d95b2f3df8cdec1154dcce05f292bdde59d0 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Marchand <jmarchan@redhat.com>
|
|
Date: Mon, 1 Jun 2026 15:22:10 +0200
|
|
Subject: [PATCH] scripts/sorttable: Have the ORC code use the _r() functions
|
|
to read
|
|
|
|
JIRA: https://redhat.atlassian.net/browse/RHEL-180193
|
|
|
|
commit 66990c003306c240d570b3ba274ec4f68cf18c91
|
|
Author: Steven Rostedt <rostedt@goodmis.org>
|
|
Date: Sun Jan 5 11:22:15 2025 -0500
|
|
|
|
scripts/sorttable: Have the ORC code use the _r() functions to read
|
|
|
|
The ORC code reads the section information directly from the file. This
|
|
currently works because the default read function is for 64bit little
|
|
endian machines. But if for some reason that ever changes, this will
|
|
break. Instead of having a surprise breakage, use the _r() functions that
|
|
will read the values from the file properly.
|
|
|
|
Cc: bpf <bpf@vger.kernel.org>
|
|
Cc: Masami Hiramatsu <mhiramat@kernel.org>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
|
|
Cc: Andrew Morton <akpm@linux-foundation.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
|
Cc: Masahiro Yamada <masahiroy@kernel.org>
|
|
Cc: Nathan Chancellor <nathan@kernel.org>
|
|
Cc: Nicolas Schier <nicolas@fjasle.eu>
|
|
Cc: Zheng Yejian <zhengyejian1@huawei.com>
|
|
Cc: Martin Kelly <martin.kelly@crowdstrike.com>
|
|
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
|
|
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
|
|
Link: https://lore.kernel.org/20250105162344.721480386@goodmis.org
|
|
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
|
|
|
|
Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
|
|
|
|
diff --git a/scripts/sorttable.h b/scripts/sorttable.h
|
|
index 18d07fdb2716..58f7ab5f5644 100644
|
|
--- a/scripts/sorttable.h
|
|
+++ b/scripts/sorttable.h
|
|
@@ -299,14 +299,14 @@ static int do_sort(Elf_Ehdr *ehdr,
|
|
#if defined(SORTTABLE_64) && defined(UNWINDER_ORC_ENABLED)
|
|
/* locate the ORC unwind tables */
|
|
if (!strcmp(secstrings + idx, ".orc_unwind_ip")) {
|
|
- orc_ip_size = s->sh_size;
|
|
+ orc_ip_size = _r(&s->sh_size);
|
|
g_orc_ip_table = (int *)((void *)ehdr +
|
|
- s->sh_offset);
|
|
+ _r(&s->sh_offset));
|
|
}
|
|
if (!strcmp(secstrings + idx, ".orc_unwind")) {
|
|
- orc_size = s->sh_size;
|
|
+ orc_size = _r(&s->sh_size);
|
|
g_orc_table = (struct orc_entry *)((void *)ehdr +
|
|
- s->sh_offset);
|
|
+ _r(&s->sh_offset));
|
|
}
|
|
#endif
|
|
} /* for loop */
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|