From 392f9ed92b5122af74f2999d9a882d4ddf153c03 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 23 May 2019 08:40:06 -0500 Subject: Fix s390 build --- ...ve-the-write-parameter-from-gup_fast_perm.patch | 73 ++++++++++++++++++++++ kernel.spec | 8 ++- 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 0001-mm-gup-Remove-the-write-parameter-from-gup_fast_perm.patch diff --git a/0001-mm-gup-Remove-the-write-parameter-from-gup_fast_perm.patch b/0001-mm-gup-Remove-the-write-parameter-from-gup_fast_perm.patch new file mode 100644 index 000000000..74e0fa9ad --- /dev/null +++ b/0001-mm-gup-Remove-the-write-parameter-from-gup_fast_perm.patch @@ -0,0 +1,73 @@ +From ad8cfb9c42ef83ecf4079bc7d77e6557648e952b Mon Sep 17 00:00:00 2001 +From: Ira Weiny +Date: Sun, 10 Feb 2019 14:34:24 -0800 +Subject: [PATCH] mm/gup: Remove the 'write' parameter from + gup_fast_permitted() + +The 'write' parameter is unused in gup_fast_permitted() so remove it. + +Signed-off-by: Ira Weiny +Acked-by: Kirill A. Shutemov +Reviewed-by: Thomas Gleixner +Cc: Andrew Morton +Cc: Borislav Petkov +Cc: Dan Williams +Cc: Dave Hansen +Cc: Linus Torvalds +Cc: Peter Zijlstra +Cc: linux-mm@kvack.org +Link: http://lkml.kernel.org/r/20190210223424.13934-1-ira.weiny@intel.com +Signed-off-by: Ingo Molnar +--- + arch/x86/include/asm/pgtable_64.h | 3 +-- + mm/gup.c | 6 +++--- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h +index 9c85b54bf03c..0bb566315621 100644 +--- a/arch/x86/include/asm/pgtable_64.h ++++ b/arch/x86/include/asm/pgtable_64.h +@@ -259,8 +259,7 @@ extern void init_extra_mapping_uc(unsigned long phys, unsigned long size); + extern void init_extra_mapping_wb(unsigned long phys, unsigned long size); + + #define gup_fast_permitted gup_fast_permitted +-static inline bool gup_fast_permitted(unsigned long start, int nr_pages, +- int write) ++static inline bool gup_fast_permitted(unsigned long start, int nr_pages) + { + unsigned long len, end; + +diff --git a/mm/gup.c b/mm/gup.c +index 05acd7e2eb22..b63e88eca31b 100644 +--- a/mm/gup.c ++++ b/mm/gup.c +@@ -1786,7 +1786,7 @@ static void gup_pgd_range(unsigned long addr, unsigned long end, + * Check if it's allowed to use __get_user_pages_fast() for the range, or + * we need to fall back to the slow version: + */ +-bool gup_fast_permitted(unsigned long start, int nr_pages, int write) ++bool gup_fast_permitted(unsigned long start, int nr_pages) + { + unsigned long len, end; + +@@ -1828,7 +1828,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write, + * block IPIs that come from THPs splitting. + */ + +- if (gup_fast_permitted(start, nr_pages, write)) { ++ if (gup_fast_permitted(start, nr_pages)) { + local_irq_save(flags); + gup_pgd_range(start, end, write, pages, &nr); + local_irq_restore(flags); +@@ -1870,7 +1870,7 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write, + if (unlikely(!access_ok((void __user *)start, len))) + return -EFAULT; + +- if (gup_fast_permitted(start, nr_pages, write)) { ++ if (gup_fast_permitted(start, nr_pages)) { + local_irq_disable(); + gup_pgd_range(addr, end, write, pages, &nr); + local_irq_enable(); +-- +2.21.0 + diff --git a/kernel.spec b/kernel.spec index 57e3361b3..f676af80d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -632,6 +632,9 @@ Patch524: net-vhost_net-fix-possible-infinite-loop.patch # Fix wifi on various ideapad models not working (rhbz#1703338) Patch525: 0001-platform-x86-ideapad-laptop-Remove-no_hw_rfkill_list.patch +# Add missing backport to fix build on s390 +Patch526: 0001-mm-gup-Remove-the-write-parameter-from-gup_fast_perm.patch + # END OF PATCH DEFINITIONS %endif @@ -1919,7 +1922,10 @@ fi # # %changelog -* Wed May 22 2019 Justin M. Forbes - 5.0.18-100 +* Thu May 23 2019 Justin M. Forbes - 5.0.18-100 +- Bring back ad8cfb9c42ef83ecf4079bc7d77e6557648e952b to fix s390 build + +* Wed May 22 2019 Justin M. Forbes - Linux v5.0.18 - Fixes CVE-2019-11833 (rhbz 1712072 1712073) -- cgit