MIPS: Fix exception handler memcpy()

The exception handler subroutines are declared as a single char, but
when copied to the required addresses the copy length is 0x80.

When range checks are enabled for memcpy() this results in a build
failure, with error messages such as:

In file included from arch/mips/mti-malta/malta-init.c:15:
In function 'memcpy',
    inlined from 'mips_nmi_setup' at arch/mips/mti-malta/malta-init.c:98:2:
include/linux/string.h:376:4: error: call to '__read_overflow2' declared with attribute error: detected read beyond size of object passed as 2nd parameter
  376 |    __read_overflow2();
      |    ^~~~~~~~~~~~~~~~~~

Change the declarations to use type char[].

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Gbp-Pq: Topic bugfix/mips
Gbp-Pq: Name mips-fix-exception-handler-memcpy.patch

diff --git a/arch/mips/loongson2ef/common/init.c b/arch/mips/loongson2ef/common/init.c
index 45512178be772ba469265126d0acda34955e2026..ce3f02f75e2a8ece3ffc6da98fb88e22eedf4bfb 100644 (file)
--- a/arch/mips/loongson2ef/common/init.c
+++ b/arch/mips/loongson2ef/common/init.c
@@ -19,10 +19,10 @@ unsigned long __maybe_unused _loongson_addrwincfg_base;
 static void __init mips_nmi_setup(void)
 {
        void *base;
-       extern char except_vec_nmi;
+       extern char except_vec_nmi[];
 
        base = (void *)(CAC_BASE + 0x380);
-       memcpy(base, &except_vec_nmi, 0x80);
+       memcpy(base, except_vec_nmi, 0x80);
        flush_icache_range((unsigned long)base, (unsigned long)base + 0x80);
 }
 

diff --git a/arch/mips/loongson64/init.c b/arch/mips/loongson64/init.c
index 5ac1a0f35ca4790449f9eb4531b76cd51743967e..293aee6a1baca08e77919191fd04ba1ddf6b6ab6 100644 (file)
--- a/arch/mips/loongson64/init.c
+++ b/arch/mips/loongson64/init.c
@@ -16,10 +16,10 @@
 static void __init mips_nmi_setup(void)
 {
        void *base;
-       extern char except_vec_nmi;
+       extern char except_vec_nmi[];
 
        base = (void *)(CAC_BASE + 0x380);
-       memcpy(base, &except_vec_nmi, 0x80);
+       memcpy(base, except_vec_nmi, 0x80);
        flush_icache_range((unsigned long)base, (unsigned long)base + 0x80);
 }
 

diff --git a/arch/mips/mti-malta/malta-init.c b/arch/mips/mti-malta/malta-init.c
index ff2c1d809538f26031559f6cf225c78c13c107ce..893af377aacc907bddb3285d96bfc1b482c729ce 100644 (file)
--- a/arch/mips/mti-malta/malta-init.c
+++ b/arch/mips/mti-malta/malta-init.c
@@ -90,24 +90,24 @@ static void __init console_config(void)
 static void __init mips_nmi_setup(void)
 {
        void *base;
-       extern char except_vec_nmi;
+       extern char except_vec_nmi[];
 
        base = cpu_has_veic ?
                (void *)(CAC_BASE + 0xa80) :
                (void *)(CAC_BASE + 0x380);
-       memcpy(base, &except_vec_nmi, 0x80);
+       memcpy(base, except_vec_nmi, 0x80);
        flush_icache_range((unsigned long)base, (unsigned long)base + 0x80);
 }
 
 static void __init mips_ejtag_setup(void)
 {
        void *base;
-       extern char except_vec_ejtag_debug;
+       extern char except_vec_ejtag_debug[];
 
        base = cpu_has_veic ?
                (void *)(CAC_BASE + 0xa00) :
                (void *)(CAC_BASE + 0x300);
-       memcpy(base, &except_vec_ejtag_debug, 0x80);
+       memcpy(base, except_vec_ejtag_debug, 0x80);
        flush_icache_range((unsigned long)base, (unsigned long)base + 0x80);
 }
 

diff --git a/arch/mips/pistachio/init.c b/arch/mips/pistachio/init.c
index a09a5da38e6b2ccf47bba7085b3628bae8209e22..558995ed6fe8867601d81c3b5358baa2a47e7399 100644 (file)
--- a/arch/mips/pistachio/init.c
+++ b/arch/mips/pistachio/init.c
@@ -83,12 +83,12 @@ phys_addr_t mips_cdmm_phys_base(void)
 static void __init mips_nmi_setup(void)
 {
        void *base;
-       extern char except_vec_nmi;
+       extern char except_vec_nmi[];
 
        base = cpu_has_veic ?
                (void *)(CAC_BASE + 0xa80) :
                (void *)(CAC_BASE + 0x380);
-       memcpy(base, &except_vec_nmi, 0x80);
+       memcpy(base, except_vec_nmi, 0x80);
        flush_icache_range((unsigned long)base,
                           (unsigned long)base + 0x80);
 }
@@ -96,12 +96,12 @@ static void __init mips_nmi_setup(void)
 static void __init mips_ejtag_setup(void)
 {
        void *base;
-       extern char except_vec_ejtag_debug;
+       extern char except_vec_ejtag_debug[];
 
        base = cpu_has_veic ?
                (void *)(CAC_BASE + 0xa00) :
                (void *)(CAC_BASE + 0x300);
-       memcpy(base, &except_vec_ejtag_debug, 0x80);
+       memcpy(base, except_vec_ejtag_debug, 0x80);
        flush_icache_range((unsigned long)base,
                           (unsigned long)base + 0x80);
 }