From: Greg Kroah-Hartman Date: Mon, 20 Jun 2016 22:09:44 +0000 (-0700) Subject: 4.4-stable patches X-Git-Tag: v3.14.73~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d418a8b5b7b3b31053e3e2c34c2ec1105547012e;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: mips-fix-64k-page-support-for-32-bit-kernels.patch --- diff --git a/queue-3.14/mips-fix-64k-page-support-for-32-bit-kernels.patch b/queue-3.14/mips-fix-64k-page-support-for-32-bit-kernels.patch new file mode 100644 index 00000000000..3abb5748f31 --- /dev/null +++ b/queue-3.14/mips-fix-64k-page-support-for-32-bit-kernels.patch @@ -0,0 +1,33 @@ +From d7de413475f443957a0c1d256e405d19b3a2cb22 Mon Sep 17 00:00:00 2001 +From: Ralf Baechle +Date: Thu, 4 Feb 2016 01:24:40 +0100 +Subject: MIPS: Fix 64k page support for 32 bit kernels. + +From: Ralf Baechle + +commit d7de413475f443957a0c1d256e405d19b3a2cb22 upstream. + +TASK_SIZE was defined as 0x7fff8000UL which for 64k pages is not a +multiple of the page size. Somewhere further down the math fails +such that executing an ELF binary fails. + +Signed-off-by: Ralf Baechle +Tested-by: Joshua Henderson +Cc: James Hogan +Signed-off-by: Greg Kroah-Hartman + +--- + arch/mips/include/asm/processor.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/mips/include/asm/processor.h ++++ b/arch/mips/include/asm/processor.h +@@ -51,7 +51,7 @@ extern unsigned int vced_count, vcei_cou + * User space process size: 2GB. This is hardcoded into a few places, + * so don't change it unless you know what you are doing. + */ +-#define TASK_SIZE 0x7fff8000UL ++#define TASK_SIZE 0x80000000UL + #endif + + #ifdef __KERNEL__ diff --git a/queue-3.14/series b/queue-3.14/series index f2ea8058d98..358a7288caa 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -10,3 +10,4 @@ parisc-fix-pagefault-crash-in-unaligned-__get_user-call.patch ecryptfs-forbid-opening-files-without-mmap-handler.patch wext-fix-32-bit-iwpriv-compatibility-issue-with-64-bit-kernel.patch fix-d_walk-non-delayed-__d_free-race.patch +mips-fix-64k-page-support-for-32-bit-kernels.patch diff --git a/queue-4.4/mips-fix-64k-page-support-for-32-bit-kernels.patch b/queue-4.4/mips-fix-64k-page-support-for-32-bit-kernels.patch new file mode 100644 index 00000000000..1cd2ad3d7c6 --- /dev/null +++ b/queue-4.4/mips-fix-64k-page-support-for-32-bit-kernels.patch @@ -0,0 +1,33 @@ +From d7de413475f443957a0c1d256e405d19b3a2cb22 Mon Sep 17 00:00:00 2001 +From: Ralf Baechle +Date: Thu, 4 Feb 2016 01:24:40 +0100 +Subject: MIPS: Fix 64k page support for 32 bit kernels. + +From: Ralf Baechle + +commit d7de413475f443957a0c1d256e405d19b3a2cb22 upstream. + +TASK_SIZE was defined as 0x7fff8000UL which for 64k pages is not a +multiple of the page size. Somewhere further down the math fails +such that executing an ELF binary fails. + +Signed-off-by: Ralf Baechle +Tested-by: Joshua Henderson +Cc: James Hogan +Signed-off-by: Greg Kroah-Hartman + +--- + arch/mips/include/asm/processor.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/mips/include/asm/processor.h ++++ b/arch/mips/include/asm/processor.h +@@ -45,7 +45,7 @@ extern unsigned int vced_count, vcei_cou + * User space process size: 2GB. This is hardcoded into a few places, + * so don't change it unless you know what you are doing. + */ +-#define TASK_SIZE 0x7fff8000UL ++#define TASK_SIZE 0x80000000UL + #endif + + #define STACK_TOP_MAX TASK_SIZE diff --git a/queue-4.4/series b/queue-4.4/series index 208639da779..40b3fee1354 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -57,3 +57,4 @@ sparc64-reduce-tlb-flushes-during-hugepte-changes.patch sparc64-take-ctx_alloc_lock-properly-in-hugetlb_setup.patch sparc-harden-signal-return-frame-checks.patch sparc64-fix-return-from-trap-window-fill-crashes.patch +mips-fix-64k-page-support-for-32-bit-kernels.patch