From: Greg Kroah-Hartman Date: Thu, 30 Apr 2020 07:14:24 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.4.37~55 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=81533f0958cc3ce2d01834f1fd9d764e6c083a16;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..5cf8ef106cc --- /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 +Date: Fri, 4 Oct 2019 09:37:36 +0200 +Subject: remoteproc: Fix wrong rvring index computation + +From: Clement Leger + +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 +Link: https://lore.kernel.org/r/20191004073736.8327-1-cleger@kalray.eu +Signed-off-by: Bjorn Andersson +Cc: Doug Anderson +Signed-off-by: Greg Kroah-Hartman + +--- + 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 1ab31636ea4..185bc6f04e9 100644 --- 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