diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2021-01-06 08:41:59 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2021-01-06 08:41:59 -0500 |
| commit | 14cfba2e906fe47a8455b253c77268272eb805f1 (patch) | |
| tree | 9a5284f8c9dfbaf448e737b813891520bda00e7e | |
| parent | 85f2ada718a81b282ee78a96d0ab1450543612e7 (diff) | |
| parent | 698222457465ce343443be81c5512edda86e5914 (diff) | |
| download | linux-14cfba2e906fe47a8455b253c77268272eb805f1.tar.gz linux-14cfba2e906fe47a8455b253c77268272eb805f1.tar.bz2 linux-14cfba2e906fe47a8455b253c77268272eb805f1.zip | |
Merge remote-tracking branch 'mips/mips-fixes' into work.elf-compat
backmerge of mips compat coredump fix
| -rw-r--r-- | arch/mips/boot/compressed/decompress.c | 3 | ||||
| -rw-r--r-- | arch/mips/kernel/binfmt_elfn32.c | 7 | ||||
| -rw-r--r-- | arch/mips/kernel/binfmt_elfo32.c | 7 |
3 files changed, 16 insertions, 1 deletions
diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c index c61c641674e6..e3946b06e840 100644 --- a/arch/mips/boot/compressed/decompress.c +++ b/arch/mips/boot/compressed/decompress.c @@ -13,6 +13,7 @@ #include <linux/libfdt.h> #include <asm/addrspace.h> +#include <asm/unaligned.h> /* * These two variables specify the free mem region @@ -117,7 +118,7 @@ void decompress_kernel(unsigned long boot_heap_start) dtb_size = fdt_totalsize((void *)&__appended_dtb); /* last four bytes is always image size in little endian */ - image_size = le32_to_cpup((void *)&__image_end - 4); + image_size = get_unaligned_le32((void *)&__image_end - 4); /* copy dtb to where the booted kernel will expect it */ memcpy((void *)VMLINUX_LOAD_ADDRESS_ULL + image_size, diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c index 136dc0c9300d..a11c291b9241 100644 --- a/arch/mips/kernel/binfmt_elfn32.c +++ b/arch/mips/kernel/binfmt_elfn32.c @@ -108,4 +108,11 @@ jiffies_to_old_timeval32(unsigned long jiffies, struct old_timeval32 *value) #undef ns_to_kernel_old_timeval #define ns_to_kernel_old_timeval ns_to_old_timeval32 +/* + * Some data types as stored in coredump. + */ +#define user_long_t compat_long_t +#define user_siginfo_t compat_siginfo_t +#define copy_siginfo_to_external copy_siginfo_to_external32 + #include "../../../fs/binfmt_elf.c" diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c index b1f4b8f1dee7..afe8940d4952 100644 --- a/arch/mips/kernel/binfmt_elfo32.c +++ b/arch/mips/kernel/binfmt_elfo32.c @@ -110,4 +110,11 @@ jiffies_to_old_timeval32(unsigned long jiffies, struct old_timeval32 *value) #undef ns_to_kernel_old_timeval #define ns_to_kernel_old_timeval ns_to_old_timeval32 +/* + * Some data types as stored in coredump. + */ +#define user_long_t compat_long_t +#define user_siginfo_t compat_siginfo_t +#define copy_siginfo_to_external copy_siginfo_to_external32 + #include "../../../fs/binfmt_elf.c" |