From: Greg Kroah-Hartman Date: Mon, 29 Apr 2019 17:45:03 +0000 (+0200) Subject: 5.0-stable patches X-Git-Tag: v4.9.172~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=541b94ed2ae6521f5a0eb447828f656122be78ca;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..4aca4ee4a0a --- /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 +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 + +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 +Cc: Leon Romanovsky +Cc: Jason Gunthorpe +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + 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 4e963239266..3521b5ba45a 100644 --- 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