Commit f288c895 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'mips_fixes_5.11.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS fixes from Thomas Bogendoerfer:

 - fix coredumps on 64bit kernels

 - fix for alignment bugs preventing booting

 - fix checking for failed irq_alloc_desc calls

* tag 'mips_fixes_5.11.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: OCTEON: fix unreachable code in octeon_irq_init_ciu
  MIPS: relocatable: fix possible boot hangup with KASLR enabled
  MIPS: Fix malformed NT_FILE and NT_SIGINFO in 32bit coredumps
  MIPS: boot: Fix unaligned access with CONFIG_MIPS_RAW_APPENDED_DTB
parents f4e087c6 7b490a8a
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/libfdt.h> #include <linux/libfdt.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/unaligned.h>
/* /*
* These two variables specify the free mem region * These two variables specify the free mem region
...@@ -117,7 +118,7 @@ void decompress_kernel(unsigned long boot_heap_start) ...@@ -117,7 +118,7 @@ void decompress_kernel(unsigned long boot_heap_start)
dtb_size = fdt_totalsize((void *)&__appended_dtb); dtb_size = fdt_totalsize((void *)&__appended_dtb);
/* last four bytes is always image size in little endian */ /* 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 */ /* copy dtb to where the booted kernel will expect it */
memcpy((void *)VMLINUX_LOAD_ADDRESS_ULL + image_size, memcpy((void *)VMLINUX_LOAD_ADDRESS_ULL + image_size,
......
...@@ -1444,7 +1444,7 @@ static void octeon_irq_setup_secondary_ciu2(void) ...@@ -1444,7 +1444,7 @@ static void octeon_irq_setup_secondary_ciu2(void)
static int __init octeon_irq_init_ciu( static int __init octeon_irq_init_ciu(
struct device_node *ciu_node, struct device_node *parent) struct device_node *ciu_node, struct device_node *parent)
{ {
unsigned int i, r; int i, r;
struct irq_chip *chip; struct irq_chip *chip;
struct irq_chip *chip_edge; struct irq_chip *chip_edge;
struct irq_chip *chip_mbox; struct irq_chip *chip_mbox;
......
...@@ -103,4 +103,11 @@ jiffies_to_old_timeval32(unsigned long jiffies, struct old_timeval32 *value) ...@@ -103,4 +103,11 @@ jiffies_to_old_timeval32(unsigned long jiffies, struct old_timeval32 *value)
#undef ns_to_kernel_old_timeval #undef ns_to_kernel_old_timeval
#define ns_to_kernel_old_timeval ns_to_old_timeval32 #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" #include "../../../fs/binfmt_elf.c"
...@@ -106,4 +106,11 @@ jiffies_to_old_timeval32(unsigned long jiffies, struct old_timeval32 *value) ...@@ -106,4 +106,11 @@ jiffies_to_old_timeval32(unsigned long jiffies, struct old_timeval32 *value)
#undef ns_to_kernel_old_timeval #undef ns_to_kernel_old_timeval
#define ns_to_kernel_old_timeval ns_to_old_timeval32 #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" #include "../../../fs/binfmt_elf.c"
...@@ -187,8 +187,14 @@ static int __init relocate_exception_table(long offset) ...@@ -187,8 +187,14 @@ static int __init relocate_exception_table(long offset)
static inline __init unsigned long rotate_xor(unsigned long hash, static inline __init unsigned long rotate_xor(unsigned long hash,
const void *area, size_t size) const void *area, size_t size)
{ {
size_t i; const typeof(hash) *ptr = PTR_ALIGN(area, sizeof(hash));
unsigned long *ptr = (unsigned long *)area; size_t diff, i;
diff = (void *)ptr - area;
if (unlikely(size < diff + sizeof(hash)))
return hash;
size = ALIGN_DOWN(size - diff, sizeof(hash));
for (i = 0; i < size / sizeof(hash); i++) { for (i = 0; i < size / sizeof(hash); i++) {
/* Rotate by odd number of bits and XOR. */ /* Rotate by odd number of bits and XOR. */
......
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