4.14-stable patches

added patches:
	remoteproc-fix-wrong-rvring-index-computation.patch

diff --git a/queue-4.14/remoteproc-fix-wrong-rvring-index-computation.patch b/queue-4.14/remoteproc-fix-wrong-rvring-index-computation.patch
new file mode 100644 (file)
index 0000000..5cf8ef1
--- /dev/null
+++ b/queue-4.14/remoteproc-fix-wrong-rvring-index-computation.patch
@@ -0,0 +1,35 @@
+From 00a0eec59ddbb1ce966b19097d8a8d2f777e726a Mon Sep 17 00:00:00 2001
+From: Clement Leger <cleger@kalray.eu>
+Date: Fri, 4 Oct 2019 09:37:36 +0200
+Subject: remoteproc: Fix wrong rvring index computation
+
+From: Clement Leger <cleger@kalray.eu>
+
+commit 00a0eec59ddbb1ce966b19097d8a8d2f777e726a upstream.
+
+Index of rvring is computed using pointer arithmetic. However, since
+rvring->rvdev->vring is the base of the vring array, computation
+of rvring idx should be reversed. It previously lead to writing at negative
+indices in the resource table.
+
+Signed-off-by: Clement Leger <cleger@kalray.eu>
+Link: https://lore.kernel.org/r/20191004073736.8327-1-cleger@kalray.eu
+Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
+Cc: Doug Anderson <dianders@chromium.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/remoteproc/remoteproc_core.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/remoteproc/remoteproc_core.c
++++ b/drivers/remoteproc/remoteproc_core.c
+@@ -288,7 +288,7 @@ void rproc_free_vring(struct rproc_vring
+ {
+       int size = PAGE_ALIGN(vring_size(rvring->len, rvring->align));
+       struct rproc *rproc = rvring->rvdev->rproc;
+-      int idx = rvring->rvdev->vring - rvring;
++      int idx = rvring - rvring->rvdev->vring;
+       struct fw_rsc_vdev *rsc;
+ 
+       dma_free_coherent(rproc->dev.parent, size, rvring->va, rvring->dma);

diff --git a/queue-4.14/series b/queue-4.14/series
index 1ab31636ea4d1eed789a3a21edc346dcf4d3f66e..185bc6f04e925ee9fdc4f42e51a6cddf7f13f3e7 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -82,3 +82,4 @@ usb-f_fs-clear-os-extended-descriptor-counts-to-zero-in-ffs_data_reset.patch
 serial-sh-sci-make-sure-status-register-scxsr-is-read-in-correct-sequence.patch
 xfs-validate-sb_logsunit-is-a-multiple-of-the-fs-blocksize.patch
 xfs-fix-deadlock-between-agi-and-agf-with-rename_whiteout.patch
+remoteproc-fix-wrong-rvring-index-computation.patch