5.0-stable patches

added patches:
	rdma-fix-build-errors-on-s390-and-mips-due-to-bad-zero_page-use.patch

diff --git a/queue-5.0/rdma-fix-build-errors-on-s390-and-mips-due-to-bad-zero_page-use.patch b/queue-5.0/rdma-fix-build-errors-on-s390-and-mips-due-to-bad-zero_page-use.patch
new file mode 100644 (file)
index 0000000..4aca4ee
--- /dev/null
+++ b/queue-5.0/rdma-fix-build-errors-on-s390-and-mips-due-to-bad-zero_page-use.patch
@@ -0,0 +1,36 @@
+From 6a5c5d26c4c6c3cc486fef0bf04ff9551132611b Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Mon, 29 Apr 2019 09:48:53 -0700
+Subject: rdma: fix build errors on s390 and MIPS due to bad ZERO_PAGE use
+
+From: Linus Torvalds <torvalds@linux-foundation.org>
+
+commit 6a5c5d26c4c6c3cc486fef0bf04ff9551132611b upstream.
+
+The parameter to ZERO_PAGE() was wrong, but since all architectures
+except for MIPS and s390 ignore it, it wasn't noticed until 0-day
+reported the build error.
+
+Fixes: 67f269b37f9b ("RDMA/ucontext: Fix regression with disassociate")
+Cc: stable@vger.kernel.org
+Cc: Andrea Arcangeli <aarcange@redhat.com>
+Cc: Leon Romanovsky <leonro@mellanox.com>
+Cc: Jason Gunthorpe <jgg@mellanox.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/infiniband/core/uverbs_main.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/infiniband/core/uverbs_main.c
++++ b/drivers/infiniband/core/uverbs_main.c
+@@ -894,7 +894,7 @@ static vm_fault_t rdma_umap_fault(struct
+ 
+       /* Read only pages can just use the system zero page. */
+       if (!(vmf->vma->vm_flags & (VM_WRITE | VM_MAYWRITE))) {
+-              vmf->page = ZERO_PAGE(vmf->vm_start);
++              vmf->page = ZERO_PAGE(vmf->address);
+               get_page(vmf->page);
+               return 0;
+       }

diff --git a/queue-5.0/series b/queue-5.0/series
index 4e9632392669d3870651c5d75d8821936bed7bf7..3521b5ba45a4c691dc3778a86661f7a713fac29f 100644 (file)
--- a/queue-5.0/series
+++ b/queue-5.0/series
@@ -68,3 +68,4 @@ aio-store-event-at-final-iocb_put.patch
 fix-aio_poll-races.patch
 x86-retpolines-raise-limit-for-generating-indirect-calls-from-switch-case.patch
 x86-retpolines-disable-switch-jump-tables-when-retpolines-are-enabled.patch
+rdma-fix-build-errors-on-s390-and-mips-due-to-bad-zero_page-use.patch