summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-06-08 14:58:04 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-06-08 14:58:04 +0200
commit622f1087654a6f7ed6c059cda88ed043ccb9a712 (patch)
tree4428fa73c57446323604d61b9c25f157119f985a
parent1cef92f34e215c007084837372c3856696c45919 (diff)
parentc90c2f5363416bffedbee438fec2b79e1cc14217 (diff)
downloadkernel-622f1087654a6f7ed6c059cda88ed043ccb9a712.tar.gz
kernel-622f1087654a6f7ed6c059cda88ed043ccb9a712.tar.xz
kernel-622f1087654a6f7ed6c059cda88ed043ccb9a712.zip
Merge remote-tracking branch 'origin/f32' into f32-user-thl-vanilla-fedora
-rw-r--r--kernel.spec6
-rw-r--r--mm-fix-mremap-not-considering-huge-pmd-devmap.patch79
2 files changed, 3 insertions, 82 deletions
diff --git a/kernel.spec b/kernel.spec
index 0b8e8608e..218e40571 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -940,9 +940,6 @@ Patch519: vboxguest-fixes.patch
# rhbz 1830150
Patch520: 0001-platform-x86-sony-laptop-SNC-calls-should-handle-BUF.patch
-# CVE-2020-10757 rhbz 1842525 1843883
-Patch521: mm-fix-mremap-not-considering-huge-pmd-devmap.patch
-
# END OF PATCH DEFINITIONS
%endif
@@ -3042,6 +3039,9 @@ fi
#
#
%changelog
+* Mon Jun 08 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.6.17-300
+- Linux v5.6.17
+
* Thu Jun 04 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.6.16-300
- Fix CVE-2020-10757 (rhbz 1842525 184388)
diff --git a/mm-fix-mremap-not-considering-huge-pmd-devmap.patch b/mm-fix-mremap-not-considering-huge-pmd-devmap.patch
deleted file mode 100644
index 328154df9..000000000
--- a/mm-fix-mremap-not-considering-huge-pmd-devmap.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From MAILER-DAEMON Thu Jun 4 17:23:35 2020
-From: Fan Yang <Fan_Yang@sjtu.edu.cn>
-Subject: [PATCH v3] mm: Fix mremap not considering huge pmd devmap
-Message-Id: <FB4049FE-AC4A-4B13-B39D-B96393EFCCB8@sjtu.edu.cn>
-Date: Thu, 04 Jun 2020 18:22:07 +0800
-Cc: "Williams, Dan J" <dan.j.williams@intel.com>, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>, Linus Torvalds <torvalds@linux-foundation.org>
-To: linux-kernel@vger.kernel.org
-Sender: linux-kernel-owner@vger.kernel.org
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List: linux-kernel@vger.kernel.org
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
-
-The original code in mm/mremap.c checks huge pmd by:
-
- if (is_swap_pmd(*old_pmd) || pmd_trans_huge(*old_pmd)) {
-
-However, a DAX mapped nvdimm is mapped as huge page (by default) but
-it is not transparent huge page (_PAGE_PSE | PAGE_DEVMAP). This
-commit changes the condition to include the case.
-
-This addresses CVE-2020-10757.
-
-Fixes: 5c7fb56e5e3f ("mm, dax: dax-pmd vs thp-pmd vs hugetlbfs-pmd")
-Cc: <stable@vger.kernel.org>
-Reported-by: Fan Yang <Fan_Yang@sjtu.edu.cn>
-Signed-off-by: Fan Yang <Fan_Yang@sjtu.edu.cn>
-Tested-by: Fan Yang <Fan_Yang@sjtu.edu.cn>
-Tested-by: Dan Williams <dan.j.williams@intel.com>
-Reviewed-by: Dan Williams <dan.j.williams@intel.com>
-Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
-
----
-
-Changelog v2->v3:
-- Added "Acked-by: Kirill..."
-
-Changelog v1->v2:
-- Removed some paragraph in commit msg, removed the comment in
- mm/mremap.c, and added a NOTE in where pmd_trans_huge is defined.
-- Added "Reviewed-by: Dan..."
-- Added "Fixes: 5c7fb56e5e3f..."
-- Added "Cc: <stable@vger.kernel.org>"
----
- arch/x86/include/asm/pgtable.h | 1 +
- mm/mremap.c | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
-index 4d02e64af1b3..19cdeebfbde6 100644
---- a/arch/x86/include/asm/pgtable.h
-+++ b/arch/x86/include/asm/pgtable.h
-@@ -257,6 +257,7 @@ static inline int pmd_large(pmd_t pte)
- }
-
- #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-+/* NOTE: when predicate huge page, consider also pmd_devmap, or use pmd_large */
- static inline int pmd_trans_huge(pmd_t pmd)
- {
- return (pmd_val(pmd) & (_PAGE_PSE|_PAGE_DEVMAP)) == _PAGE_PSE;
-diff --git a/mm/mremap.c b/mm/mremap.c
-index 6aa6ea605068..57b1f999f789 100644
---- a/mm/mremap.c
-+++ b/mm/mremap.c
-@@ -266,7 +266,7 @@ unsigned long move_page_tables(struct vm_area_struct *vma,
- new_pmd = alloc_new_pmd(vma->vm_mm, vma, new_addr);
- if (!new_pmd)
- break;
-- if (is_swap_pmd(*old_pmd) || pmd_trans_huge(*old_pmd)) {
-+ if (is_swap_pmd(*old_pmd) || pmd_trans_huge(*old_pmd) || pmd_devmap(*old_pmd)) {
- if (extent == HPAGE_PMD_SIZE) {
- bool moved;
- /* See comment in move_ptes() */
---
-2.25.4
-
-
-