Commit f39293fd authored by Ben Hutchings's avatar Ben Hutchings Committed by Thomas Bogendoerfer

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: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarYunQiang Su <syq@debian.org>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 21e1a03e
...@@ -19,10 +19,10 @@ unsigned long __maybe_unused _loongson_addrwincfg_base; ...@@ -19,10 +19,10 @@ unsigned long __maybe_unused _loongson_addrwincfg_base;
static void __init mips_nmi_setup(void) static void __init mips_nmi_setup(void)
{ {
void *base; void *base;
extern char except_vec_nmi; extern char except_vec_nmi[];
base = (void *)(CAC_BASE + 0x380); 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); flush_icache_range((unsigned long)base, (unsigned long)base + 0x80);
} }
......
...@@ -22,10 +22,10 @@ u32 node_id_offset; ...@@ -22,10 +22,10 @@ u32 node_id_offset;
static void __init mips_nmi_setup(void) static void __init mips_nmi_setup(void)
{ {
void *base; void *base;
extern char except_vec_nmi; extern char except_vec_nmi[];
base = (void *)(CAC_BASE + 0x380); 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); flush_icache_range((unsigned long)base, (unsigned long)base + 0x80);
} }
......
...@@ -90,24 +90,24 @@ static void __init console_config(void) ...@@ -90,24 +90,24 @@ static void __init console_config(void)
static void __init mips_nmi_setup(void) static void __init mips_nmi_setup(void)
{ {
void *base; void *base;
extern char except_vec_nmi; extern char except_vec_nmi[];
base = cpu_has_veic ? base = cpu_has_veic ?
(void *)(CAC_BASE + 0xa80) : (void *)(CAC_BASE + 0xa80) :
(void *)(CAC_BASE + 0x380); (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); flush_icache_range((unsigned long)base, (unsigned long)base + 0x80);
} }
static void __init mips_ejtag_setup(void) static void __init mips_ejtag_setup(void)
{ {
void *base; void *base;
extern char except_vec_ejtag_debug; extern char except_vec_ejtag_debug[];
base = cpu_has_veic ? base = cpu_has_veic ?
(void *)(CAC_BASE + 0xa00) : (void *)(CAC_BASE + 0xa00) :
(void *)(CAC_BASE + 0x300); (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); flush_icache_range((unsigned long)base, (unsigned long)base + 0x80);
} }
......
...@@ -83,12 +83,12 @@ phys_addr_t mips_cdmm_phys_base(void) ...@@ -83,12 +83,12 @@ phys_addr_t mips_cdmm_phys_base(void)
static void __init mips_nmi_setup(void) static void __init mips_nmi_setup(void)
{ {
void *base; void *base;
extern char except_vec_nmi; extern char except_vec_nmi[];
base = cpu_has_veic ? base = cpu_has_veic ?
(void *)(CAC_BASE + 0xa80) : (void *)(CAC_BASE + 0xa80) :
(void *)(CAC_BASE + 0x380); (void *)(CAC_BASE + 0x380);
memcpy(base, &except_vec_nmi, 0x80); memcpy(base, except_vec_nmi, 0x80);
flush_icache_range((unsigned long)base, flush_icache_range((unsigned long)base,
(unsigned long)base + 0x80); (unsigned long)base + 0x80);
} }
...@@ -96,12 +96,12 @@ static void __init mips_nmi_setup(void) ...@@ -96,12 +96,12 @@ static void __init mips_nmi_setup(void)
static void __init mips_ejtag_setup(void) static void __init mips_ejtag_setup(void)
{ {
void *base; void *base;
extern char except_vec_ejtag_debug; extern char except_vec_ejtag_debug[];
base = cpu_has_veic ? base = cpu_has_veic ?
(void *)(CAC_BASE + 0xa00) : (void *)(CAC_BASE + 0xa00) :
(void *)(CAC_BASE + 0x300); (void *)(CAC_BASE + 0x300);
memcpy(base, &except_vec_ejtag_debug, 0x80); memcpy(base, except_vec_ejtag_debug, 0x80);
flush_icache_range((unsigned long)base, flush_icache_range((unsigned long)base,
(unsigned long)base + 0x80); (unsigned long)base + 0x80);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment