diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-06-28 02:17:45 +0200 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-06-29 08:58:17 +0000 |
| commit | d149a04c88156943d8aa1aa89dabeaf9931a1c14 (patch) | |
| tree | f06a74a9deb144b1de7419150c9e117cccaa4c3e /meta-agl-bsp/recipes-kernel/linux/linux-yocto/0002-Allow-stack-to-grow-up-to-address-space-limit.patch | |
| parent | 425556a8923c6255c28b15f04afae603b00873c5 (diff) | |
Backport fix for CVE-2017-1000364 to linux-yocto-4.4
Backport of upstream fixes from 4.4 kernel branch to linux-yocto:
- https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-4.4.y&id=4b359430674caa2c98d0049a6941f157d2a33741
- https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-4.4.y&id=f41512c6acb71c63cf4e3bd50934365ae2a23891
- https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-4.4.y&id=1f2284fac2180d7a9442c796d9755e3ce7ab0bd9
Bug-AGL: SPEC-705 SPEC-706
Change-Id: I8f180d6d58d985ca7186638015a57d3d836a9a61
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9861
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Stéphane Desneux <stephane.desneux@iot.bzh>
Diffstat (limited to 'meta-agl-bsp/recipes-kernel/linux/linux-yocto/0002-Allow-stack-to-grow-up-to-address-space-limit.patch')
| -rw-r--r-- | meta-agl-bsp/recipes-kernel/linux/linux-yocto/0002-Allow-stack-to-grow-up-to-address-space-limit.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/meta-agl-bsp/recipes-kernel/linux/linux-yocto/0002-Allow-stack-to-grow-up-to-address-space-limit.patch b/meta-agl-bsp/recipes-kernel/linux/linux-yocto/0002-Allow-stack-to-grow-up-to-address-space-limit.patch new file mode 100644 index 000000000..bbcda5f2e --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux-yocto/0002-Allow-stack-to-grow-up-to-address-space-limit.patch @@ -0,0 +1,51 @@ +From 19600a40e93b1a9690271853c00d9d63b140c85b Mon Sep 17 00:00:00 2001 +From: Helge Deller <deller@gmx.de> +Date: Mon, 19 Jun 2017 17:34:05 +0200 +Subject: [PATCH 2/3] Allow stack to grow up to address space limit + +commit bd726c90b6b8ce87602208701b208a208e6d5600 upstream. + +Fix expand_upwards() on architectures with an upward-growing stack (parisc, +metag and partly IA-64) to allow the stack to reliably grow exactly up to +the address space limit given by TASK_SIZE. + +Signed-off-by: Helge Deller <deller@gmx.de> +Acked-by: Hugh Dickins <hughd@google.com> +Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + mm/mmap.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/mm/mmap.c b/mm/mmap.c +index 7567494e0dfa..3ca4fc9f0dac 100644 +--- a/mm/mmap.c ++++ b/mm/mmap.c +@@ -2172,16 +2172,19 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address) + if (!(vma->vm_flags & VM_GROWSUP)) + return -EFAULT; + +- /* Guard against wrapping around to address 0. */ ++ /* Guard against exceeding limits of the address space. */ + address &= PAGE_MASK; +- address += PAGE_SIZE; +- if (!address) ++ if (address >= TASK_SIZE) + return -ENOMEM; ++ address += PAGE_SIZE; + + /* Enforce stack_guard_gap */ + gap_addr = address + stack_guard_gap; +- if (gap_addr < address) +- return -ENOMEM; ++ ++ /* Guard against overflow */ ++ if (gap_addr < address || gap_addr > TASK_SIZE) ++ gap_addr = TASK_SIZE; ++ + next = vma->vm_next; + if (next && next->vm_start < gap_addr) { + if (!(next->vm_flags & VM_GROWSUP)) +-- +2.12.3 + |