From: Vegard Nossum <vegard.nossum@oracle.com>
To: linux-kernel@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>,
Linus Torvalds <torvalds@linux-foundation.org>,
"Luis R . Rodriguez" <mcgrof@kernel.org>,
Vegard Nossum <vegard.nossum@oracle.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
stable@vger.kernel.org
Subject: [PATCH 02/12] firmware: declare {__start,__end}_builtin_fw as external array
Date: Sun, 16 Oct 2016 17:16:06 +0200 [thread overview]
Message-ID: <20161016151616.31451-3-vegard.nossum@oracle.com> (raw)
In-Reply-To: <20161016151616.31451-1-vegard.nossum@oracle.com>
The test in this loop:
for (b_fw = __start_builtin_fw; b_fw != __end_builtin_fw; b_fw++) {
was getting completely compiled out by my gcc, 7.0.0 20160520. The result
was that the loop was going beyond the end of the builtin_fw array and
giving me a page fault when trying to dereference b_fw->name inside
strcmp().
By using the new external array helper macros we get the expected
behaviour.
Reported-by: Jiri Slaby <jslaby@suse.cz>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: stable@vger.kernel.org
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
---
arch/x86/kernel/cpu/microcode/core.c | 5 ++---
drivers/base/firmware_class.c | 9 +++++----
include/asm-generic/vmlinux.lds.h | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index 5ce5155..6669746 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -91,15 +91,14 @@ static bool __init check_loader_disabled_bsp(void)
return *res;
}
-extern struct builtin_fw __start_builtin_fw[];
-extern struct builtin_fw __end_builtin_fw[];
+DECLARE_EXTARRAY(struct builtin_fw, builtin_fw);
bool get_builtin_firmware(struct cpio_data *cd, const char *name)
{
#ifdef CONFIG_FW_LOADER
struct builtin_fw *b_fw;
- for (b_fw = __start_builtin_fw; b_fw != __end_builtin_fw; b_fw++) {
+ ext_for_each(b_fw, builtin_fw) {
if (!strcmp(name, b_fw->name)) {
cd->size = b_fw->size;
cd->data = b_fw->data;
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 22d1760..b85d943e6 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -9,6 +9,7 @@
#include <linux/capability.h>
#include <linux/device.h>
+#include <linux/extarray.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/timer.h>
@@ -43,15 +44,14 @@ MODULE_LICENSE("GPL");
#ifdef CONFIG_FW_LOADER
-extern struct builtin_fw __start_builtin_fw[];
-extern struct builtin_fw __end_builtin_fw[];
+DECLARE_EXTARRAY(struct builtin_fw, builtin_fw)
static bool fw_get_builtin_firmware(struct firmware *fw, const char *name,
void *buf, size_t size)
{
struct builtin_fw *b_fw;
- for (b_fw = __start_builtin_fw; b_fw != __end_builtin_fw; b_fw++) {
+ ext_for_each(b_fw, builtin_fw) {
if (strcmp(name, b_fw->name) == 0) {
fw->size = b_fw->size;
fw->data = b_fw->data;
@@ -69,9 +69,10 @@ static bool fw_is_builtin_firmware(const struct firmware *fw)
{
struct builtin_fw *b_fw;
- for (b_fw = __start_builtin_fw; b_fw != __end_builtin_fw; b_fw++)
+ ext_for_each(b_fw, builtin_fw) {
if (fw->data == b_fw->data)
return true;
+ }
return false;
}
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 3074796..d6121ac 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -317,7 +317,7 @@
.builtin_fw : AT(ADDR(.builtin_fw) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_builtin_fw) = .; \
*(.builtin_fw) \
- VMLINUX_SYMBOL(__end_builtin_fw) = .; \
+ VMLINUX_SYMBOL(__stop_builtin_fw) = .; \
} \
\
TRACEDATA \
--
2.10.0.479.g221bd91
next prev parent reply other threads:[~2016-10-16 15:17 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-16 15:16 [PATCH 00/12] external array access helpers Vegard Nossum
2016-10-16 15:16 ` [PATCH 01/12] extarray: define helpers for arrays defined in linker scripts Vegard Nossum
2016-10-17 7:04 ` Greg Kroah-Hartman
2016-10-17 8:33 ` Peter Zijlstra
2016-10-17 9:01 ` Jiri Slaby
2016-10-17 9:09 ` Peter Zijlstra
2016-10-17 11:27 ` Vegard Nossum
2016-10-17 11:45 ` Peter Zijlstra
2016-10-18 8:08 ` Vegard Nossum
2016-10-18 21:18 ` Luis R. Rodriguez
2016-10-19 8:18 ` Richard Biener
2016-10-19 9:13 ` Peter Zijlstra
2016-10-19 9:33 ` Richard Biener
2016-10-19 10:25 ` Peter Zijlstra
2016-10-19 11:11 ` Richard Biener
2016-10-19 11:31 ` Peter Zijlstra
2016-11-02 12:11 ` Markus Trippelsdorf
2016-11-02 12:14 ` Richard Biener
2016-11-02 15:02 ` Linus Torvalds
2016-10-19 7:16 ` Jiri Slaby
2016-10-16 15:16 ` Vegard Nossum [this message]
2016-10-16 15:16 ` [PATCH 03/12] ftrace: declare __{start,stop}_mcount_loc as external array Vegard Nossum
2016-10-16 15:16 ` [PATCH 04/12] tracing: declare __{start,stop}_{annotated_,}branch_profile " Vegard Nossum
2016-10-16 15:16 ` [PATCH 05/12] kprobes: declare __{start,stop}_kprobe_blacklist " Vegard Nossum
2016-10-17 5:53 ` Masami Hiramatsu
2016-10-16 15:16 ` [PATCH 06/12] tracing: declare __{start,stop}_ftrace_events " Vegard Nossum
2016-10-16 15:16 ` [PATCH 07/12] tracing: declare __{start,stop}_ftrace_enum_maps " Vegard Nossum
2016-10-16 15:16 ` [PATCH 08/12] tracing: declare __trace_bprintk_fmt/__tracepoint_str as external arrays Vegard Nossum
2016-10-16 15:16 ` [PATCH 09/12] tracing: declare __{start,stop}_syscalls_metadata as external array Vegard Nossum
2016-10-16 15:16 ` [PATCH 10/12] serial_core: declare __earlycon_table{,_end} " Vegard Nossum
2016-10-16 15:16 ` [PATCH 11/12] jump_label: declare jump table " Vegard Nossum
2016-10-16 16:25 ` Peter Zijlstra
2016-10-16 16:50 ` Vegard Nossum
2016-10-16 17:44 ` Peter Zijlstra
2016-10-17 21:33 ` Steven Rostedt
2016-10-16 15:16 ` [PATCH 12/12] dynamic debug: declare " Vegard Nossum
2016-10-16 16:14 ` [PATCH 00/12] external array access helpers Greg Kroah-Hartman
2016-10-16 17:05 ` Vegard Nossum
2016-10-17 7:02 ` Greg Kroah-Hartman
2016-10-17 6:26 ` Jiri Slaby
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=20161016151616.31451-3-vegard.nossum@oracle.com \
--to=vegard.nossum@oracle.com \
--cc=dmitry.torokhov@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®