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:57 +0000 |
commit | 1a1cae6bf202f7115c32e899781e9d6e689fb50a (patch) | |
tree | 5512d9f0bf7df67bc55e753dc48198251a80b164 /meta-agl-bsp/meta-qcom/recipes-kernel/linux/files/0003-mm-fix-new-crash-in-unmapped_area_topdown.patch | |
parent | c8d604496f6bfa707b1e4a51c0e34ee9c074af7a (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: Id22e1e2f7ccc173a8ecfce523e8781f852fa3564
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9959
Diffstat (limited to 'meta-agl-bsp/meta-qcom/recipes-kernel/linux/files/0003-mm-fix-new-crash-in-unmapped_area_topdown.patch')
-rw-r--r-- | meta-agl-bsp/meta-qcom/recipes-kernel/linux/files/0003-mm-fix-new-crash-in-unmapped_area_topdown.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/meta-agl-bsp/meta-qcom/recipes-kernel/linux/files/0003-mm-fix-new-crash-in-unmapped_area_topdown.patch b/meta-agl-bsp/meta-qcom/recipes-kernel/linux/files/0003-mm-fix-new-crash-in-unmapped_area_topdown.patch deleted file mode 100644 index aa6c0dbb9..000000000 --- a/meta-agl-bsp/meta-qcom/recipes-kernel/linux/files/0003-mm-fix-new-crash-in-unmapped_area_topdown.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 166258fc1e072a1dbcac678427291854d01f2163 Mon Sep 17 00:00:00 2001 -From: Hugh Dickins <hughd@google.com> -Date: Tue, 20 Jun 2017 02:10:44 -0700 -Subject: [PATCH 3/3] mm: fix new crash in unmapped_area_topdown() - -commit f4cb767d76cf7ee72f97dd76f6cfa6c76a5edc89 upstream. - -Trinity gets kernel BUG at mm/mmap.c:1963! in about 3 minutes of -mmap testing. That's the VM_BUG_ON(gap_end < gap_start) at the -end of unmapped_area_topdown(). Linus points out how MAP_FIXED -(which does not have to respect our stack guard gap intentions) -could result in gap_end below gap_start there. Fix that, and -the similar case in its alternative, unmapped_area(). - -Fixes: 1be7107fbe18 ("mm: larger stack guard gap, between vmas") -Reported-by: Dave Jones <davej@codemonkey.org.uk> -Debugged-by: Linus Torvalds <torvalds@linux-foundation.org> -Signed-off-by: Hugh Dickins <hughd@google.com> -Acked-by: Michal Hocko <mhocko@suse.com> -Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - mm/mmap.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/mm/mmap.c b/mm/mmap.c -index d71a61e..145d3d5 100644 ---- a/mm/mmap.c -+++ b/mm/mmap.c -@@ -1813,7 +1813,8 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info) - /* Check if current node has a suitable gap */ - if (gap_start > high_limit) - return -ENOMEM; -- if (gap_end >= low_limit && gap_end - gap_start >= length) -+ if (gap_end >= low_limit && -+ gap_end > gap_start && gap_end - gap_start >= length) - goto found; - - /* Visit right subtree if it looks promising */ -@@ -1916,7 +1917,8 @@ unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info) - gap_end = vm_start_gap(vma); - if (gap_end < low_limit) - return -ENOMEM; -- if (gap_start <= high_limit && gap_end - gap_start >= length) -+ if (gap_start <= high_limit && -+ gap_end > gap_start && gap_end - gap_start >= length) - goto found; - - /* Visit left subtree if it looks promising */ --- -2.1.4 - |