diff options
author | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-06-29 17:20:38 +0200 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-06-29 15:47:41 +0000 |
commit | cff9db0bcb4226e4c85d48f1208e0042da018693 (patch) | |
tree | b5551b776908242adfe2c9a8d5cb802a7b562dc9 /meta-agl-bsp/meta-qcom/recipes-kernel/linux/files/0002-Allow-stack-to-grow-up-to-address-space-limit.patch | |
parent | d0d26f74d709fb509f97204a6fdfa122e9204295 (diff) |
db410c kernel fixed CVE-2017-1000364 upstream thus remove our patches
https://git.linaro.org/landing-teams/working/qualcomm/kernel.git/log/?h=release/qcomlt-4.9
contains now the necessary patches. We no longer need ours.
Bug-AGL: SPEC-705 SPEC-707
Change-Id: Ib96f543c8ecde33c4fd9848a23f41e1f55ea32e9
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9957
Diffstat (limited to 'meta-agl-bsp/meta-qcom/recipes-kernel/linux/files/0002-Allow-stack-to-grow-up-to-address-space-limit.patch')
-rw-r--r-- | meta-agl-bsp/meta-qcom/recipes-kernel/linux/files/0002-Allow-stack-to-grow-up-to-address-space-limit.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/meta-agl-bsp/meta-qcom/recipes-kernel/linux/files/0002-Allow-stack-to-grow-up-to-address-space-limit.patch b/meta-agl-bsp/meta-qcom/recipes-kernel/linux/files/0002-Allow-stack-to-grow-up-to-address-space-limit.patch deleted file mode 100644 index a729670c1..000000000 --- a/meta-agl-bsp/meta-qcom/recipes-kernel/linux/files/0002-Allow-stack-to-grow-up-to-address-space-limit.patch +++ /dev/null @@ -1,51 +0,0 @@ -From cd9d55be3ed9827f11a4fe5aca2b8b2f848a7c28 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 26542b3..d71a61e 100644 ---- a/mm/mmap.c -+++ b/mm/mmap.c -@@ -2224,16 +2224,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.1.4 - |